Abort a Git Merge

Question

I am working on a project using Git as the VCS. I got a branch xyz cut from the mainline branch of master. After working for a while, I committed my code and took a

Answer 1

If you do "git status" while having a merge conflict, the first thing git shows you is how to abort the merge.