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

If you never want to see the work in the popped stash again, this is as simple as a hard reset:

git reset --hard HEAD

This tells git to ignore the fact that you have uncommitted changes in your working directory, and sets the working directory, the staging area, and head to the commit you specify -- in this case, the existing HEAD, that contains all the work you've just committed.