GitDojo
All courses
intermediate5 lessons

Merge Conflicts

Learn why conflicts happen, how to read conflict markers, and how to resolve them by hand, one file or several at a time.

0 of 5 lessons0%

Start with: 01 Why Conflicts Happen

Start course

Lessons

  1. 01Why Conflicts Happen (current lesson)Concept
  2. 02Reading Conflict Markers (not started)Concept
  3. 03Resolve Your First Conflict (not started)
  4. 04Multiple File Conflict (not started)
  5. 05Conflict Challenge (not started)Challenge