3 ms·
It's easy if you always do exactly the right thing in the right order and never make mistakes, but if you for example want to undo a git merge[1], god have merc
by marginalia_nu 4y ago
It's easy if you always do exactly the right thing in the right order and never make mistakes, but if you for example want to undo a git merge[1], god have mercy.
[1] https://opensource.apple.com/source/Git/Git-26/src/git-htmldocs/howto/revert-a-faulty-merge.txt https://opensource.apple.com/source/Git/Git-26/src/git-htmld...
- psychoslave 4y agoIn doubt, I create a new branch from the main one, and test it goes when merging the one holding changes. It something goes wrong, at least the main branch is unaffected. Of course, you must already have some intuition that something could go wrong. :D
- deleted 4y ago[deleted]
- imetatroll 4y agoReflog lets you see where HEAD has traveled from. Just go back in time. This isn't actually a hard problem to solve. If that sounds difficult just create a branch prior to merging so that you know where to reset your failed branch to.
- BeeOnRope 4y agoThey are trying to solve this problem without rewriting the branch.