Tom Medley Tom Medley - 2 months ago 51x
Git Question

Can't pop git stash, 'Your local changes to the following files would be overwritten by merge'

So I had a load of changes and some untracked files. I needed to tweak something, so I used

git stash -u
, modified a couple of things, committed those changes, pushed them, and then tried to
git stash pop

Because I'd modified a couple of files that I'd stashed, I got the following message:

error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.

This seems odd, I had committed all new changes, my checkout was clean when I ran the command.

It seems the
git stash pop
operation un-stashed half of my changes and the untracked files, but if I try and
git stash pop
again I get output like:

some_file.html already exists, no checkout
some_other_file.html already exists, no checkout
yet_another_file.html already exists, no checkout
Could not restore untracked files from stash

git stash show
still shows a list of my stashed changes, but I'm at a loss as to what I do now.

How can I get myself unstuck?


I got around this, I think it must have been some kind of bug, as my working directory was clean and up to date.

I ran git checkout . and after that git stash apply worked fine, I got everything back no problems at all. I'd be interested to work out what actually caused it to fail though.