Merge conflicts on GitHub: why they happen and what to do

What a merge conflict on GitHub is and why two branches can clash on the same line, what "This branch has conflicts that must be resolved" means, how to read conflict markers and resolve a simple conflict in the browser, and why choosing the right text is a product decision.

Lesson 6 of 15~34 min of learningIncludes ~17 min for questions and tasks