Lesson 14 of 24 · Fixing Mistakes

Diff and Merge Tools

Optional. Resolving conflicts visually rather than by reading angle brackets in a text file — worth setting up before your first real merge conflict, not during it.

Optional — ticking this does not change your percentage.

Video not playing? Some channels disable embedding, and there is no way around it.Open on YouTubeinstead — then come back and mark it complete.