Branches and Merging

Maya wants to build a new favorites feature for Pageturn. It'll take her a few days, and halfway through, the code will be a mess of unfinished work. She can't do that in the same code readers are using right now — she'd break the live site while she experiments.

The answer is a branch: a separate line of work, split off from the shared code, where Maya can make commits freely without touching what everyone else relies on. When the feature is finished and working, merging folds her branch back into the shared version. Branching and merging are how a whole team works on one project at once without stepping on each other.

mainthe shared code

→

New branchMaya's own line

→

Commitsthe feature takes shape

→

Mergefolded back into main

The main version

Every repo has one version that counts as the real, current Pageturn — the shared code everyone builds on and the version that gets deployed to readers. By long convention it's called main. Keeping main healthy and working is the team's shared priority, because main is what ships.

You don't want half-finished experiments landing in main, because anything there is supposed to be solid. So the trick is to do your messy, in-progress work somewhere else, and only bring it into main once it's ready.

A branch: working off to the side

A branch is exactly that "somewhere else" — a separate line of work that starts from the same point as main and then goes its own way. Think of it like writing your section in your own draft document instead of typing straight into the shared manuscript everyone is reading.

On her branch, Maya can commit as often as she likes, break things, fix them, and try ideas — and none of it touches main or the other developers. The live site and everyone else's work carry on untouched while her feature quietly takes shape.

Many branches at once

Branches aren't just for one person. The other developers each have their own, working on their own features in parallel. Five people can be changing Pageturn at the same time, each on a separate branch, none of them colliding — the exact problem version control set out to solve.

This is why branching is the everyday rhythm of a real team: almost no one works directly on main. You branch off, do your work, and bring it back.

Merging: folding it back in

When Maya's favorites feature is finished and working, it has to rejoin the real Pageturn. Merging is that step — it takes the changes from her branch and folds them into main, so now everyone's copy includes her feature.

Most of the time the system merges the changes cleanly on its own. But if two branches changed the very same lines, it can't guess who's right, so it stops and asks a human to resolve the conflict — a normal part of the work, not a failure. Branching and merging is the core daily loop you'll practice in Git for Beginners, and it's the foundation of the pull request, which is next.