When a merge fails, it gets you out of the merge conflict state and prints a nice message about what to do next.
When a merge fails, it gets you out of the merge conflict state and prints a nice message about what to do next.