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.
In more detail
It keeps unfinished work away from the main branch until it is reviewed. Short-lived feature branches, merged within a day or two, keep merge conflicts small.
Related terms
- branch — In Git, a movable name for one commit; committing on the branch moves the name forward to the new commit.
- Git Flow — A branching model published by Vincent Driessen in 2010 with long-lived main and develop branches plus feature, release and hotfix branches.
- merge — Combining the work of two branches into one, either by moving a branch forward (a fast-forward) or by recording a merge commit.
- pull request — A request on a hosting service such as GitHub to merge one branch into another, with a page for review, discussion and automated checks.
- 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.
Taught in
- Trunk-Based Development Versus Git Flow — DevOps & Site Reliability Engineering
- A Branch Is A Moving Pointer — Advanced Git Internals & Distributed Workflows
- The Pull Request, And Branch Naming — Advanced Git Internals & Distributed Workflows
- Trunk Based Development Versus Git Flow — Advanced Git Internals & Distributed Workflows