Working in parallel.
WHY BRANCHES EXIST
So work can proceed without disturbing what works.
WHAT A SIMPLE APPROACH LOOKS LIKE
One main branch, always deployable Short-lived branches for each piece of work Merging back frequently
WHY SHORT-LIVED
Long-running branches diverge, and merging becomes painful.
WHAT TO AVOID
Branches living for weeks Several long-running branches A main branch that does not work
WHY THE MAIN BRANCH MUST WORK
It is what you deploy, and what you return to.
WHAT MORE ELABORATE APPROACHES ADD
Separate branches for releases and fixes.
WHEN THOSE ARE WARRANTED
When you support several versions simultaneously.
WHAT MOST SMALL TEAMS NEED
The simple approach.
WHAT TO PROTECT
The main branch, so changes arrive through review.
WHAT TO AUTOMATE
Checks on every branch, before merging.
WHAT TO DELETE
Branches once merged.
WHY
Otherwise the list becomes unusable.
