Undo steps
Undo merge one step.
$ git reset --hard HEAD~1 # last commit in merged branches
$ git reset --hard commit_sha # revert to branch commit
Last
Undo last merge.
git merge dev
# master
git status
# master
git reset --hard origin/master
# HEAD is now at b957a73 m1
Undo multiple
Undo last merge (with multiple commits).
# master
git merge dev
less example.txt
<<<<<<< HEAD
master line
=======
dev line 2
>>>>>>> dev
# master|MERGING
$ git merge dev -X theirs
# error: 'merge' is not possible because you have unmerged files ...
# Undo merge one step
$ git reset --hard HEAD~1
#HEAD is now at d5f8b30 m
git status
# On branch master
# nothing to commit, working directory clean
Last update: 496 days ago
