title: How can I have different commits for merge and conflict resolution
body: <p>I merged develop branch into my feature branch, which resulted in merge conflicts after resolving those I committed and pushed, Now problem is the merge and conflict resolution changes are in one commit and it is hard to find what was done to resolve the conflicts. How can I have two separate commits one for merge and another for conflict fixes when there are merge conflicts?</p>