Git Stash Failed

git git-stash smartgit
Jake Wilson picture Jake Wilson · Feb 17, 2015 · Viewed 7.4k times · Source

I am using SmartGit in Windows. Today I needed to do a hard reset back a couple commits. SmartGit automatically made a stash for me of my modified files.

After the reset, it tried to apply the stash:

$ git.exe stash apply --index stash@{0}

But it gave me:

Apply Stash: stash failed (return code 1).

I can view the stash contents and see all my code, but I can't apply the stash. How do I fix this?

Answer

Mudassir Razvi picture Mudassir Razvi · Feb 17, 2015

Just do git stash pop. It will get you your stashed changes in the working tree. (pop considering you want stash@{0}.

Hope it helps!

Related questions

Stash only one file out of multiple files that have changed with Git?

How can I stash only one of multiple changed files on my branch?

Read More
How do I ignore an error on 'git pull' about my local changes would be overwritten by merge?

How do I ignore the following error message on Git pull? Your local changes to the following files would be overwritten by merge What if I want to overwrite them? I've tried things like git pull -f, but nothing works. …

Read More
See what's in a stash without applying it

I see here you can apply/unapply a stash and even create a new branch off of a stash. Is it possible to simply see what is inside the stash without actually applying it?

Read More