rainerhgw@diasp.org
Rainer Sokoll ✅

#git ist ja auch irgendwie ein #Dreckstool

❯ git revert --no-commit 9a13096..HEAD
error: The following untracked working tree files would be overwritten by merge:
    .ssh/gitlab.example.com
    .ssh/gitlab.example.com.pub
    .ssh/gitlab.example.org
    .ssh/gitlab.example.org.pub
Please move or remove them before you merge.
Aborting
fatal: revert failed
❯ rm gitlab.*
❯ git revert --no-commit 9a13096..HEAD
error: revert is already in progress
hint: try "git revert (--continue | --abort | --quit)"
fatal: revert failed
❯ git revert --continue
CONFLICT (modify/delete): .ssh/.gitignore deleted in HEAD and modified in parent of ec1bcec (do not version keys).  Version parent of ec1bcec (do not version keys) of .ssh/.gitignore left in tree.
error: could not revert ec1bcec... do not version keys
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
8