title: git : Pull is not possible because you have unmerged files
body: <p>I am using php-git client to pull branches in my php script.
  and whenever i do checkout from master to testing i get following error.</p>
  
  <pre><code>error: Pull is not possible because you have unmerged files.
  hint: Fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  hint: as appropriate to mark resolution and make a commit.
  fatal: Exiting because of an unresolved conflict.
  </code></pre>
  
  <p>my files are on bitbucket server. and i add/modify files on bitbucket and commit there.</p>
  
  <p>I dont understand , I dont mofify anything on my local machine, still i get this error.</p>
  
  <p>Following is my 'git status' output.</p>
  
  <pre><code>Your branch is up-to-date with 'origin/testing'.
  
  You have unmerged paths.
    (fix conflicts and run "git commit")
    (use "git merge --abort" to abort the merge)
  
  Changes to be committed:
  
      modified:   g_1.0.yaml
      new file:   potter_3.4.yaml
      new file:   potter_3.4.yml
  
  Unmerged paths:
    (use "git add &lt;file&gt;..." to mark resolution)
  
      both modified:   abc_1.0.json
  </code></pre>