Module 2 · Git and how code actually ships Lesson 4 of 15

Commits, branches and merge conflicts

Worked example

Two people editing the same line of the same file produce a conflict block with <<<<<<< markers. Resolving it means choosing or combining the two versions and deleting the markers, then committing the result.

Your practice task

Deliberately create a conflict between two branches of your own project and resolve it both ways: keeping one side, then keeping both.

Do this before moving on. Reading a solution teaches the shape of it; typing it teaches you.

Key takeaway

A commit is a labelled snapshot; a branch is a movable line of snapshots. A merge conflict is Git refusing to guess which of two edits you meant — and it is normal, not a failure.

Almost there

15 lessons left of 15

Finish every lesson to unlock the certificate. Each one ends in a practice task — do them and the final project brief writes itself.