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

You need to add app.coffee to staging.

Do git add app.coffee and then you will be able to apply your stash (after that commit and push).