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

Its much simpler than the accepted answer. You need to:

1. Check git status and unmerged paths under it. Fix the conflicts. You can skip this step if you'd rather do it later.

2. Add all these files under unmerged paths to index using git add .

3. Now do git stash pop. If you get any conflicts these will again need to be resolved.