title: Discard Git Stash Pop
body: <p>I did a git stash pop and now I have a ton of conflicts. I had committed all my recent code before the <code>git stash pop</code>, so is there a way to go back to the last commit and get rid of all the conflicts and code the <code>git stash pop</code> injected?</p>