Skip to content
DoingCamp CS

Make it comfy

Lesson style

Quick mode shows the key picture, a summary and the practice. Good for a refresher.

Theme
Font

Both fonts are designed to be easy to read. Some readers with dyslexia prefer Lexend.

Text size
Spacing
Animations

Lesson 9 of 16 · about 17 min

Git 2: branches and merging

A branch is a separate line of work, so you can try an idea without disturbing the main version. Merging brings the work back together, and a conflict is git asking you to choose when two changes collide.

🔓 Unlock this lesson

This lesson is part of the DoingCamp Pass. Members get every lesson in every course, with all the interactive visuals, coding exercises and challenges.

In this lesson you'll learn:

  • Branch
  • Merge
  • Merge conflict

Free to try in F04 Tools of the Trade:

The first 3 lessons of every course are free, no account needed.