branching strategy
A team's agreed rules for which branches exist, how long they live and how work moves between them.
In more detail
Git Flow and trunk-based development are the two best-known. The right one depends on how you deliver: software released as numbered versions benefits from release branches, while continuously delivered web applications do better with one trunk and short-lived branches.
Related terms
- trunk-based development — A branching practice where developers merge small changes into one main branch, the trunk, at least once a day, keeping any other branches short-lived.
- Git Flow — A branching model published by Vincent Driessen in 2010 with long-lived main and develop branches plus feature, release and hotfix branches.
- branch — In Git, a movable name for one commit; committing on the branch moves the name forward to the new commit.
- feature branch — A branch made for one piece of work, such as a feature or bug fix, and merged back when that work is done.
Taught in
- Trunk-Based Development Versus Git Flow — DevOps & Site Reliability Engineering
- Trunk Based Development Versus Git Flow — Advanced Git Internals & Distributed Workflows