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

Here's how I solved the issue:

• git status (see a mix of files from a previous stash, pull, stash pop, and continued work.)
• git stash (see the needs merge issue)
• git add . (add the files so my work locally resolves my own merged)
• git stash (no error)
• git pull (no error)
• git stash pop (no error and continue working)