Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert: Remove Fiche.yml #90

Closed

Conversation

Ki-er
Copy link
Collaborator

@Ki-er Ki-er commented Aug 25, 2023

As part of #1
No commits since 2018 - https://github.com/solusipse/fiche
Two issues asking if project dead - solusipse/fiche#107 and solusipse/fiche#100
Purritobin which is present on this list is based on this - see solusipse/fiche#100

@Ki-er Ki-er added curation Removal of abandoned projects, dead links reviewers wanted Awaiting reviews labels Aug 25, 2023
Copy link
Collaborator

@kokomo123 kokomo123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i suggest fixing the delete commit conflict before we fully delete Fiche.yml, oof.

@nodiscc
Copy link
Member

nodiscc commented Aug 26, 2023

i suggest fixing the delete commit conflict before we fully delete Fiche.yml, oof.

Yeah this is one of the downsides of the new automatic metadata update system: metadata updates conflict with file deletions, and there is no way to resolve this from the Github UI:

image

However it's easy enough to resolve using git cherry-pick, I will take care of it before merging, no action needed from the submitter:

~/GIT/awesome-selfhosted-data (master=)$ git remote add forks-by-kieran https://github.com/forks-by-kieran/awesome-selfhosted-data
~/GIT/awesome-selfhosted-data (master=)$ git remote update 
~/GIT/awesome-selfhosted-data (master=)$ git cherry-pick forks-by-kieran/revert/fiche
CONFLICT (modify/delete): software/fiche.yml deleted in a4d786c5e (revert: Remove Fiche.yml) and modified in HEAD. Version HEAD of software/fiche.yml left in tree.
error: could not apply a4d786c5e... revert: Remove Fiche.yml
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
~/GIT/awesome-selfhosted-data (master *+|CHERRY-PICKING=)$ git mergetool 
Merging:
software/fiche.yml
Deleted merge conflict for 'software/fiche.yml':
  {local}: modified file
  {remote}: deleted
Use (m)odified or (d)eleted file, or (a)bort? d
~/GIT/awesome-selfhosted-data (master +|CHERRY-PICKING=)$ git cherry-pick --continue 
[master 151cf48d8] revert: Remove Fiche.yml
 Author: KieranRobson <kieranrobson1999@gmail.com>
 Date: Fri Aug 25 12:33:21 2023 +0100
 1 file changed, 14 deletions(-)
 delete mode 100644 software/fiche.yml
~/GIT/awesome-selfhosted-data (master>)$ 

Copy link
Member

@nodiscc nodiscc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be noted that this software is still packaged in Debian: https://packages.debian.org/bookworm/fiche and due to it being plain C without complex dependencies, it may not need much maintenance. However there are working, maintained alternatives/equivalent software, so approving.

@nodiscc nodiscc removed the reviewers wanted Awaiting reviews label Aug 26, 2023
Copy link
Collaborator

@kokomo123 kokomo123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same with the sentiments above.

@nodiscc
Copy link
Member

nodiscc commented Sep 1, 2023

Merged in 51f48f3

@nodiscc nodiscc closed this Sep 1, 2023
@Ki-er Ki-er deleted the revert/fiche branch September 1, 2023 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
curation Removal of abandoned projects, dead links
Development

Successfully merging this pull request may close these issues.

None yet

3 participants