how to resolve merge conflicts in a git reverting code example Example: git merge abort git merge --abort