Branches, merging and conflicts

50 min Node.js 22 (Debian, git, npm, python3)

Objective

Work on several things at once without mixing them up: create a branch for each topic, merge it when it is ready, and resolve a conflict calmly when two people have changed the same line.

This lesson is part of the full course

Unlock Git: Version Control and Teamwork to read every lesson, do the exercises, access the simulations and earn your certificate.

Buy — 190 MAD All-access pass — 1,490 MAD

Already enrolled? Log in.