title: How to resolve git pull conflicts in xcode ui
body: <p>I am using the Xcode repository GUI with the latest version of Xcode instead of the command line. I did an initial pull of the rep without a problem. I made some changes to the local files. At the same time, my other developer made some changes. I committed my changes to the local rep but needed his changes to  do a proper build. We only have 1 branch.</p>
  
  <p>I tried to pull and the Xcode UI reports 6 conflicts (which is what I would expect as I need the 6 files to do the proper build). </p>
  
  <p>My question is how to resolve the conflicts? I read online I should be able to use the left and right button at the bottom of screen to let me pick which file version. I went through all of the 6 files and used the proper buttons to choose which changes I wanted.</p>
  
  <p>However the Pull button in the lower right hand corner is disabled and greyed out.</p>