title: How to resolve git stash conflict without commit?
body: <p>As <a href="https://stackoverflow.com/q/7517124/11343">asked in this question</a>, I also want to know how to resolve a conflicting <code>git stash pop</code> without adding all modifications to a commit (just like &quot;git stash pop&quot; without a conflict does).</p>
  <p>My current approach is very uncool because I do it this way:</p>
  
  <pre class="lang-sh prettyprint-override"><code>git stash pop  # -&gt; CONFLICT
  git stash drop
  # [resolve conflict]
  # [add conflict files]
  git reset HEAD # &lt;all files that are in commit-mode&gt;
  </code></pre>
  <hr />
  <p><strong>How to reproduce:</strong></p>
  <pre class="lang-sh prettyprint-override"><code>mkdir foo; cd foo; git init
  echo &quot;1&quot; &gt; one
  echo &quot;2&quot; &gt; two
  git add -A; git commit -m &quot;first&quot;
  echo &quot;1.1&quot; &gt; one
  echo &quot;2.1&quot; &gt; two
  git stash
  echo &quot;2.2&quot; &gt; two
  git commit -a -m &quot;second&quot;
  echo &quot;Only this file would stay in HEAD without the conflict&quot; &gt; third
  git add third
  git stash pop
  git status
  </code></pre>
  <p>2016-06-27: Added a new file called 'third' to the example to show that workarounds like the solution from scy only work for empty HEADs but don't fix the initial problem that the HEAD doesn't have the same content like for a <code>git stash pop</code> without a conflict.</p>