undo git stash apply conflict code example

Example 1: undo git stash with conflicts

git reset HEAD . (note the trailing dot)
git stash (save the conflicted merge, just in case)
git checkout develop
git fetch upstream; git merge upstream/develop
git checkout <new-branch>; git rebase develop
git stash apply stash@{1}

Example 2: git stash pop resolve conflict

$ git stash pop

# ...resolve conflict(s)

$ git reset

$ git stash drop