Git stash pop with binary - merge conflict

问题

I'm trying to do a "git stash pop" with a binary file. It results in a merge conflict. I just want to pull what's in the stash off and overwrite what's in the working directory. What is the easiest way to do that?

回答1:

To restore all files to their stashed version:

$ git checkout stash -- .

来源：https://stackoverflow.com/questions/29979038/git-stash-pop-with-binary-merge-conflict