Resolving conflicts — Git, visually · Step Through

Step Through Course overview

Git, visually›Branching out

Full course lesson

Resolving conflicts

Lesson 20 of 36
5 min
1 quiz

Two quick steps unlock all 36 lessons:

Sign in with email or GitHub
Enter your course coupon

Not ready yet? Start the free lessons →

Google and GitHub only share your name, picture and email with us.

or

© 2026 Step Through. Learn by seeing.

Pricing Terms Privacy Refunds Contact