title: Xcode Version control: fatal: cannot do a partial commit during a merge
body: <p>When using Xcode's Source Control, I get the following error after 
  pressing <strong>commit # Files and Push</strong>. </p>
  
  <p><strong>The working copy “Project” failed to commit files.</strong></p>
  
  <blockquote>
    <p>fatal: cannot do a partial commit during a merge.</p>
  </blockquote>
  
  <p>I am using Xcode 9+. I have looked <a href="https://stackoverflow.com/questions/5827944/git-error-on-commit-after-merge-fatal-cannot-do-a-partial-commit-during-a-mer">here</a> but have not found anything that resolves the issue for Xcode's Source Control.</p>
  
  <p>Thanks for the help.</p>