stash pop is creating merge conflict code example Example: git stash apply undo merge conflict git reset HEAD .