There are two mainstream branching strategies in git and many lesser known strategies.
When building GitVersion we had to work through not only how to use the branching strategies but how we could fully support semantic versioning in each of these strategies.
Introduction to branching strategies
Git is a very powerful tool and if you do not settle on a branching strategy and associated workflows then you will likely lose work at some point. At the start of any project I recommend picking a branching strategy and making sure your whole team understands it.
GitHubFlow is a simple and powerful branching strategy. It is what GitHub uses and the branching strategy most open source projects use.
- Mainline development on
- Work on feature branches, merge into
mastervia pull requests
- Works well for continuous delivery
- Does not have a way to manage/maintain old releases
- Only allows working on a single release at a time
GitFlow is a more complex and complete branching strategy. It also gives much more control over when features and code is released.
- Development on
masteronly contains released code
- Supports maintaining old releases (like nServiceBus, they support the last 3 major versions with bug fixes and security updates)
- Supports development on multiple releases at one time
Choosing a branching strategy
There are a few reasons you would pick GitFlow over GitHubFlow, they are:
- You need to support multiple major versions at the same time
- You need to work on multiple releases at the same time
- For example a new feature which will go in the next major version, while bug fixes/smaller features are still going into the current release
But if you do not have a good reason to go with GitFlow, then start with GitHubFlow. It is a far simpler model and if you end up needing GitFlow later, it is easy to convert