Recap — Conflict Markers and Resolution Strategies
The anatomy of a conflict, the three sections (HEAD, incoming, merged), and how to resolve cleanly.
7 minutesInteractive tutorial
🎯 Free Guest Mode: You are learning for free. Sign in to save your completion progress and quiz answers.
Question 1 of 8Answer saved0 answered