title: Pull is not possible because you have unmerged files, git stash doesn't work. Don't want to commit
body: <p>I just want to pull. I have changes to disregard, my Gemfile and Gemlock files and I'd be happy to just overwrite them and just pull. I tried stashing my changes away, this didn't work out for me. What do I do?</p>
  
  <pre><code>git pull
  M   Gemfile
  U   Gemfile.lock
  Pull is not possible because you have unmerged files.
  Please, fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  as appropriate to mark resolution, or use 'git commit -a'.
  ~/projects/sms/apps2/apps2_admin(apps2)$ git stash save "saved"
  Gemfile.lock: needs merge
  Gemfile.lock: needs merge
  Gemfile.lock: unmerged (4ea16799dba7bfe1db28adecf36dee1af5195c1a)
  Gemfile.lock: unmerged (e77439c9f86d1d0eda7ae0787e3e158f90959e68)
  Gemfile.lock: unmerged (d690d3860db1aa8e46c1bb2f4de3e52a297b5c26)
  fatal: git-write-tree: error building trees
  Cannot save the current index state
  ~/projects/sms/apps2/apps2_admin(apps2)$ git pull
  M   Gemfile
  U   Gemfile.lock
  Pull is not possible because you have unmerged files.
  Please, fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  as appropriate to mark resolution, or use 'git commit -a'.
  </code></pre>