How to unmerge a Git merge?
Solution 1:
You can reset your branch to the state it was in just before the merge if you find the commit it was on then.
One way is to use git reflog, it will list all the HEADs you've had.
I find that git reflog --relative-date is very useful as it shows how long ago each change happened.
Once you find that commit just do a git reset --hard <commit id> and your branch will be as it was before.
If you have SourceTree, you can look up the <commit id> there if git reflog is too overwhelming.
Solution 2:
If you haven't committed the merge, then use:
git merge --abort