title: Cannot push, pull or merge git. "Working copy has uncommited changes"
body: <p>I have recently set up a git repository on bitbucket, and have added an old project onto it. I have committed and pushed a change as a test, but now I face this problem.</p>
  
  <p>Each time I try to Pull, Push, or Merge I get this error message:</p>
  
  <p><img src="https://i.stack.imgur.com/9nSBg.png" alt="The working copy &quot;&quot; has uncommitted changes."></p>
  
  <p>"The working copy 'Project_Name' has uncommitted changes".</p>
  
  <p>And I have committed this change several times:</p>
  
  <p><img src="https://i.stack.imgur.com/fuqgn.png" alt="The file seems to be named: User Interface State"></p>
  
  <hr>
  
  <p><strong>EDIT</strong>: I did 'git status' and got the following:</p>
  
  <pre><code># On branch master
  # Your branch is ahead of 'origin/master' by 2 commits.
  #
  # Changes not staged for commit:
  #   (use "git add &lt;file&gt;..." to update what will be committed)
  #   (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
  #
  #   modified:   Crunch.xcodeproj/project.xcworkspace/xcuserdata/Neil.xcuserdatad/UserInterfaceState.xcuserstate
  #
  no changes added to commit (use "git add" and/or "git commit -a")
  </code></pre>
  
  <hr>
  
  <p>Help would be greatly appreciated, SirKaydian</p>