Branching Strategies
In this section, we’ll explore various branching strategies, explaining how each one works, and highlighting the differences between them.
While every company has its unique workflow, we’ll focus on some commonly used strategies in the industry.
With GitFlow being the initial workflow, everyone is familiar with it in the industry and its successors have improved by making minor changes to the workflow.
In the next sections, we’ll discuss each workflow, but first, we have to understand the fundamentals of GitFlow.
GitFlow
One of the most common and most mature workflows in the industry is GitFlow. It was created by Vincent Driessen in 2010.
A minimal Git repository should have the following branches:
- main/master/trunk (referred to as main from this point on)
- develop
The main
branch is what you start with when creating a new repository. The purpose of this branch is to always have stable and production-ready...