-
Notifications
You must be signed in to change notification settings - Fork 223
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
Conversation
There was a problem hiding this 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.
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: However it's easy enough to resolve using ~/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>)$ |
There was a problem hiding this 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.
There was a problem hiding this 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.
Merged in 51f48f3 |
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