cancel git merge with conflicts code example Example 1: git undo comflicted merge git merge --abort Example 2: abort merge git git merge --abort