Git stash pop- needs merge, unable to refresh index

Question

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.

app.coffee: needs         


        

Answer 1

I have found that the best solution is to branch off your stash and do a resolution afterwards.

git stash branch

if you drop of clear your stash, you may lose your changes and you will have to recur to the reflog.