title: Git stash pop error - Your local changes to the following files would be overwritten by merge
body: <p>I have the following error when i use <code>git stash pop</code>:</p>
  <pre><code>error: Your local changes to the following files would be overwritten by merge:
          user/h2oai_driver.py
          user/quantile_lift.R
          user/scratch.ipynb
  Please commit your changes or stash them before you merge.
  Aborting
  The stash entry is kept in case you need it again.
  </code></pre>
  <p>I want to pop my changes from stash. But I don't need any changes in user/... files.
  What should i do in this situation? (i have nothing to commit or stash so i can't follow the advice
  <code>commit your changes or stash them before you merge</code>)</p>