Merge Conflicts

A conflict is Git telling you it found two answers to the same question and will not guess. It is not a failure, not damage, and not a sign that anything is broken: your work is intact, the other person's work is intact, and Git is waiting for a decision. This section removes the fear, then makes the mechanics routine: read the markers, decide, mark it resolved, finish the merge. Every step has an escape hatch that puts everything back.

Before you start: Section 6 for merging and rebasing, and Section 7 for pulling. It helps to have run Lab 3, though the exercises here create their own conflicts.