WEEK 7 · LESSON 7 · TOPIC 4 OF 11 · Merge Conflict
Lesson progress
SECTION 1 OF 1
A conflict can occur when two branches modify the same line or section differently.