I am trying to resolve a very simple merge conflict. I changed a comment in each of two branches to force a merge conflict, then merged one branch into the other. The conflict occurred (as it should have). I have winmerge set as my merge tool. I merged the changes in winmerge until both files were identical, saved and quit winmerge.
My version control panel then shows the attached. It says there are no conflicted changes to resolve. The conflicted file is shown as 'Resolved or without conflicts'. However, the 'Proceed' button is greyed out and my only option is to undo the merge.
Any thoughts? I'd really like to recommend this as our IDE of choice later today (based on prior experience) but that relies on my getting the version control workflow ironed out.