Resolving Merge Conflicts

Part of the Git course

The first time Git refuses to finish a merge, it can feel like something broke. Nothing broke. A merge conflict happens when two branches changed the same lines of the same file in different ways, and Git genuinely cannot guess which version you want to keep.

This lesson needs a conflict to resolve, so this block builds one: a hello-git repository in this lesson's folder where main and a feature-login branch each added a different sentence at the same spot in README.md. Press Play to create it (pressing it again starts over) ...