title: Xcode 8 source control does not show conflicts
body: <p>After Xcode has updated to version 8.0 (8A218a), I have a problem pulling changes from git repository from Xcode <strong>only</strong> when some files are conflicted. We are all working on the same branch.</p>
  
  <p>As long as there are no conflicts, everything works perfectly and I am able to commit, pull and push. </p>
  
  <p>But I figured out that whenever we have a conflict in some of the files, <strong>Xcode is not showing conflicts</strong> anymore. It just closes the pull popup window without showing the conflict resolver window. No info or anything. I don't see the</p>
  
  <blockquote>
    <p>Pull successful</p>
  </blockquote>
  
  <p>message. And I can't push my commit (because changes are not pulled) getting the message:</p>
  
  <blockquote>
    <p>Make sure all changes have been pulled from the remote repository and
    try again</p>
  </blockquote>
  
  <p>I have tried pulling using <strong>terminal</strong>, but the conflicted file gets messed up with git messages showing mine and other people changes in the same conflicted file along those git messages. And the files that other people were working on are now shown as my own changes/additions.</p>
  
  <p>I also tried updating git to the newest version, which is currently 2.10.0. No luck either.</p>
  
  <p>So I end up deleting my copy and cloning the latest one and reapplying changes that i've made which is very annoying.</p>
  
  <p>Does anyone have a solution for this?</p>
  
  <p>EDIT:
  Here is what you can do as a <strong>workaround using the terminal</strong>: </p>
  
  <ol>
  <li><p>Open terminal and tell the system where Xcode utilities live: </p>
  
  <pre><code>sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer
  </code></pre></li>
  <li><p>Set "opendiff" as the default mergetool globally: </p>
  
  <pre><code>git config --global merge.tool opendiff
  </code></pre></li>
  <li><p>Open Xcode mergetool manually and get rid of the conflict the usual way: </p>
  
  <pre><code>git mergetool
  </code></pre></li>
  <li><p>Save changes, commit, push.</p></li>
  </ol>