Aborting a stash pop in Git

Question

I popped a stash and there was a merge conflict. Unlike the question that is listed as a duplicate, I already had some uncommitted changes in the directory which I wanted to

Answer 1

Use git reflog to list all changes made in your git history. Copy an action id and type git reset ACTION_ID