undo git stash pop merge conflict code example

Example 1: git stash apply undo merge conflict

git reset HEAD .

Example 2: git stash pop resolve conflict

$ git stash pop

# ...resolve conflict(s)

$ git reset

$ git stash drop