title: Can't pop git stash, 'Your local changes to the following files would be overwritten by merge'
body: <p>So I had a load of changes and some untracked files. I needed to tweak something, so I used <code>git stash -u</code>, modified a couple of things, committed those changes, pushed them, and then tried to <code>git stash pop</code>.</p>
  
  <p>Because I'd modified a couple of files that I'd stashed, I got the following message:</p>
  
  <pre><code>error: Your local changes to the following files would be overwritten by merge:
      file_1.py
      file_2.py
  Please, commit your changes or stash them before you can merge.
  Aborting
  </code></pre>
  
  <p>This seems odd, I had committed all new changes, my checkout was clean when I ran the command.</p>
  
  <p>It seems the <code>git stash pop</code> operation un-stashed half of my changes and the untracked files, but if I try and <code>git stash pop</code> again I get output like:</p>
  
  <pre><code>some_file.html already exists, no checkout
  some_other_file.html already exists, no checkout
  yet_another_file.html already exists, no checkout
  Could not restore untracked files from stash
  </code></pre>
  
  <p><code>git stash show</code> still shows a list of my stashed changes, but I'm at a loss as to what I do now.</p>
  
  <p>How can I get myself unstuck?</p>