Git stash pop with binary-merge conflict

Question

I am trying to make "git stash pop" a binary. This leads to a merge conflict. I just want to pull out what is written and overwrite what is in the working directory. What is the easiest way to do this?

Answer 1

To restore all files to their hidden version:

$ git checkout stash -- .