title: Undo git stash pop that results in merge conflict
body: <p>I began making changes to my codebase, not realizing I was on an old topic branch. To transfer them, I wanted to stash them and then apply them to a new branch off of master. I used <code>git stash pop</code> to transfer work-in-progress changes to this new branch, forgetting that I hadn't pulled new changes into master before creating the new branch. This resulted in a bunch of merge conflicts and loss of a clean stash of my changes (since I used pop).</p>
  
  <p>Once I recreate the new branch correctly, how I can I recover my stashed changes to apply them properly? </p>