title: Merge Conflicts and FAST FORWARD in Git
body: <p>I am trying to set up a Merge conflict in git. When I try to resolve it, I do not see any Automerging failed message form git. It just displays fast-forward. How can I disable this and see all messages?</p>