`git stash` during a merge conflict

Question

We\'ve done something bad.

We ran git stash save during a merge conflict, and now we can\'t restore our work.

Things we\'ve tried:

g         


        

Answer 1

When you are in a conflicted state ( index and working directory), you will not be able to do git stash - it will give an error sating unmerged entries.

Make sure that you have really done a stash. See output of git stauts and git stash show