how to revert a merge conflict in git code example Example: git undo comflicted merge git merge --abort