title: The operation could not be performed because "PROJECTNAME" has one or more tree conflicts
body: <p>I am using Git and when I tried to pull a newer development branch with my current branch using XCode's source control menu I received this error message:</p>
  
  <pre><code>The operation could not be performed because "ProjectName" has one or more tree conflicts.
  </code></pre>
  
  <p>How do I resolve these tree conflicts?
  Thanks</p>