git stash apply merge conflict but no changes code example Example: git stash apply undo merge conflict git reset HEAD .