CODEWITHSUNDEEP
gitgit-stashmerge-conflict-resolution
Mr Mikkél
Mr Mikkél

Reputation: 2643

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?

Upvotes: 10

Views: 5093

Answers (2)

QuinnP
QuinnP

Reputation: 1

You may also get errors when applying your stash if your local current version of the binary file is still open because git can't replace it with the stashed version.

Upvotes: 0

Alex Pan
Alex Pan

Reputation: 4621

To restore all files to their stashed version:

$ git checkout stash -- .

Upvotes: 21

Related Questions