Abort merge

Bila nak merge, ada conflict. Bila kita dah fix part yang conflict, kemudian decide nak cancel merge:-

git reset HEAD filename
git checkout filename
git status
On branch elms-115-back-to-allauth
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

nothing to commit, working directory clean

Masih dalam merge mode. Ada cara lebih mudah rupanya:-

git merge --abort

http://tedfelix.com/software/git-conflict-resolution.html