Xcode 8 source control does not show conflicts

I use git in Terminal to solve this problem, mergetool is used.Fisrt, I pull some changes, but oops, not up to date:

git fetch origingit pull origin masterFrom ssh://gitosis@example.com:22/projectname * branch            master     -> FETCH_HEADUpdating a030c3a..ee25213error: Entry 'filename.c' not uptodate. Cannot merge.

So get up-to-date and try again, but have a conflict:

git add filename.cgit commit -m "made some wild and crazy changes"git pull origin masterFrom ssh://gitosis@example.com:22/projectname * branch            master     -> FETCH_HEADAuto-merging filename.cCONFLICT (content): Merge conflict in filename.cAutomatic merge failed; fix conflicts and then commit the result.

So I decide to take a look at the changes:

git mergetool

use mergetool to merge the conflict

changes...no...their changes...git checkout --ours filename.cgit checkout --theirs filename.cgit add filename.cgit commit -m "using theirs"

And then we try a final time

git pull origin masterFrom ssh://gitosis@example.com:22/projectname * branch            master     -> FETCH_HEADAlready up-to-date.

answer from:How to resolve merge conflicts in Git?

The following sequence of actions resolves this problem:

Exit Xcode

Open Terminal and cd to the project's folder

git checkout -- .

git pull

Look at the output of the pull command. It should announce that there is a conflict in one of the files.Open this file in an external editor (not Xcode). The file should now contain special markers describing the conflict (they were added by GIT)The markers look like this:

<<<<<<< HEAD:file.txtHello world=======Goodbye>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt

Delete the markers and resolve the conflict

git add [file name]

git commit -m "conflict in [file name] resolved"

git push

Please update to Xcode 8.2.1

I had the same problem.But it is resolved once I have updated my Xcode version to 8.2.1.

I have resolved all the conflicts today,which I was facing with Xcode Version 8.1.