Undo a git merge (hasn’t been pushed yet)

To undo a merge that was NOT pushed:

git reset --merge ORIG_HEAD

If during the merge you get a conflict, the best way to undo the merge is:

git merge --abort