title: Git stash pop- needs merge, unable to refresh index
body: <p>I can't pop my stash because I merged a branch which apparently conflicts with my stash and now my stash is seemingly unable to be popped.</p>
  
  <pre><code>app.coffee: needs merge
  unable to refresh index
  </code></pre>
  
  <p>Anyone know how to resolve this?</p>
  
  <p><strong>FIXED!</strong></p>
  
  <p>Turns out the actual issue was an unresolved merge conflict from the merge, <strong>NOT</strong> that the stash would cause a merge conflict.</p>
  
  <p>Resolution: Commit the conflicted file.</p>