Finding GIT STASH from previous branch?

Question

The scenario:

• working on Branch A.
• needed to pause to work on a different branch.
• ran git stash and then checked out Branch B.
• worked on Branch B a bit then needed to go back to Branch A.
• ran git stash on Branch B and then checked out Branch A.

Here's where I screwed up

• ran git stash apply on Branch A thinking it was going to apply my stash from Branch A back.

It didn't. It took the stashed files from Branch B and applied it to Branch A.

Is there any way to back out of this and get the changes I originally stashed while in Branch A? Or are they gone?

Answer 1

You can re-stash the changes you just applied (git stash) then find in the stash list (git stash list) the one you need, then git stash pop <stashRefYouSpottedEarlier> to finish the process.