I just pulled in another developers commit.
Before doing so I stashed my working directory changes, then pulled and merged. Then I hit “apply stash”.
One of the files is marked as merge conflict. In the contents view, it is under a separate list entitled “Unmerged files”.
The unmerged file presents the option of “resolve” and “stage”, where as the other files present the options of “discard” and “stage”.
When hit the “resolve” button, I am presented with a three way merge tool. I then proceed to resolve the merge, and save.
But nothing changes! The files is still listed as an “unmerged file”, it is still listing the “resolve” button, and when I hit resolve, the changes I previously made to resolve the issue are still present!!! Like nothing has happened. I repeatedly try saving my merge resolution, but everytime I hit resolve, my previous resolution is removed!