A set of rules that helps a team coordinate how they share and organize their code changes.

Branching Strategy Basics

The primary home for your project's code, usually kept clean and ready for users to see.

The Main Branch

A shared workspace where the team puts their finished work to test it together before a final release.

Private side-paths created for working on one specific task without distracting the rest of the team.

A temporary area used to polish and double-check code just before it is officially launched.

Emergency branches used to quickly fix a serious bug that is currently affecting live users.

The process of taking code from a side branch and carefully adding it back into the main project.

A situation where two people changed the same line of code, requiring a human to decide which version to keep.

A formal way to ask your teammates to review your work before it gets added to the main code.

A highly organized plan that uses many different types of branches to manage complex software releases.

A simple and fast plan that focuses on merging small feature branches directly into the main branch.

A strategy where everyone works on one single branch to keep things moving as fast as possible.

A plan that uses separate branches to represent different stages, like 'Testing' or 'Production'.

Digital 'on/off' switches in the code that allow you to hide unfinished features from users without using branches.

Branches that are created for a very small task and deleted within a day or two to prevent clutter.