title: git - errors after merge conflicts during stash pop
body: <p>Original title: git - update all files that have not been changed</p>
  
  <p>Currently I am trying to update all files in a git repository that have not been changed. Lets say for example I have:</p>
  
  <ul>
  <li>test1.py</li>
  <li>test2.py</li>
  </ul>
  
  <p>test1.py has been modified locally while both files have been modified remotely. Now I tried:</p>
  
  <pre><code>git stash
  git pull
  git stash pop
  </code></pre>
  
  <p>which restored my changes, giving me a warning that I need to merge <code>test1.py</code>. So far so good. The problem arises when I try to do the same process again (after both files have been again changed remotly). Git now says</p>
  
  <pre><code>unmerged (6b126638f7c63aa648609afa60ab972a2403502b)
  fatal: git-write-tree: error building trees
  Cannot save the current index state
  </code></pre>
  
  <p>which makes me kind of sad. It just want a simple thing: Update all files that I haven't changed. I will take care of merging later.</p>