I made a branch in Xcode some time ago and then forgot to switch back when I merged that branch on GitHub. I realized this and changed my local branch back to master, but it's old and there's 75 changes to pull. When I try, I'm told there are conflicts. Looking in the source control pane's Changes panel, I saw two text files with the C, I assume these are the issue.
One of the files did not exist in the project (at the time of the branch), so I added it and it said it had a conflict in the project view. The file was fine though, so I marked it resolved.
The second file was in the project. Here's the problem: it says it is conflicted in the source control view, but not in the project view. Unfortunately, you can only mark it resolved in the source code view, and since it says no conflict, I can't mark it off.
Any ideas how to clear this?
