title: Pull not possible because you have unmerged files
body: <p>I'm trying to deploy our django project to AWS. Our fabfile that handles the deployment uses a git pull (of course). During the pull, we receive the error below:</p>
  
  <pre><code>[ec2-54-215-107-223.us-west-1.compute.amazonaws.com] Executing task 'deploy'
  [ec2-54-215-107-223.us-west-1.compute.amazonaws.com] run: git pull origin master
  [ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: U impact/c/views.py
  [ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: Pull is not possible because you have unmerged files.
  [ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: Please, fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  [ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: as appropriate to mark resolution, or use 'git commit -a'.
  [ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: 
  
  
  Fatal error: run() received nonzero return code 1 while executing!
  </code></pre>
  
  <p>Now I know there have been a few other users post this question on here, and believe me when I say I have read a lot of them, but none seem to work for us. There are no merge / conflict errors when committing locally, the error only seems to happen when we perform the pull from the SSH terminal of the AWS server.</p>