Discard Git Stash Pop

Question

I did a git stash pop and now I have a ton of conflicts. I had committed all my recent code before the git stash pop, so is there a way to go back to the last commi

Answer 1

Reset can also be called on specific files :

git reset HEAD ...

You can't hard reset a file though. But you can revert the changes with checkout afterwards :

git checkout -- ...

You stash will be preserved, as pointed out by Luke in MichaelMilom answer.

This is useful when you don't want to lose your un-committed local changes.