what to do if you dont want to resolve conflicts and go back code example Example: git undo comflicted merge git merge --abort