Undo git stash pop that results in merge conflict

As it turns out, Git is smart enough not to drop a stash if it doesn’t apply cleanly. I was able to get to the desired state with the following steps:

1. To unstage the merge conflicts: git reset HEAD . (note the trailing dot)
2. To save the conflicted merge (just in case): git stash
3. To return to master: git checkout master
4. To pull latest changes: git fetch upstream; git merge upstream/master
5. To correct my new branch: git checkout new-branch; git rebase master
6. To apply the correct stashed changes (now 2nd on the stack): git stash apply stash@{1}