merge conflict after git stash apply code example Example: git stash apply undo merge conflict git reset HEAD .