Merging and Merge Conflicts

Finish the lesson and pass the quick check in "Branches" to unlock this lesson.

Learning here is a ladder, not a playlist. Each lesson assumes the one before it, so we keep the next rung closed until the current one holds your weight.