Monday, October 26, 2015

Git: cancel merge

With git log check which commit is one prior the merge. Then you can reset it using:
git reset --hard commit_sha