Git Flow
A branching model published by Vincent Driessen in 2010 with long-lived main and develop branches plus feature, release and hotfix branches.
In more detail
It was designed for explicitly versioned software where several versions are supported at once. In 2020 its author added a note that teams doing continuous delivery of web apps should adopt a simpler workflow, such as GitHub flow, instead.
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.
- branch — In Git, a movable name for one commit; committing on the branch moves the name forward to the new commit.
- hotfix — An urgent, unplanned change deployed to repair a problem in production.
- 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.
- branching strategy — A team's agreed rules for which branches exist, how long they live and how work moves between them.
Taught in
- Trunk-Based Development Versus Git Flow — DevOps & Site Reliability Engineering
- Trunk Based Development Versus Git Flow — Advanced Git Internals & Distributed Workflows