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

Simple one-liner

I have always used

git reset --merge

I can't remember it ever failing.