Please enable JavaScript.
Coggle requires JavaScript to display documents.
A review of Git branching strategies - Coggle Diagram
A review of Git branching strategies
Why you need a branching strategy?
Enhance developer productivity by ensuring proper coordination
Ensure parallel development
Organize a series of planned, structured releases
Establish a clear path for software changes through production
Ensure that developers are able to fix bugs quickly and get them back into production without disrupting their workflow
Strategies
Gitflow
Github Flow
The main or master branch is created firstly
Developers create feature branches which are merged back into the main/master branch and then they are deleted
Gitlab Flow
The
development
branch is used to integrate the team's work - features are merged there
An alternative to Github flow which support deployments on more than one environments
One branch per environment - deploy by merging code there
:check: Proper isolation between environments
:check: Different versions of software in different environments
The main/master can be used as stage environment
Trunk-based development
Everyone is working on the trunk (or master) directly
:check: avoid merge conflicts
Using short-lived branches - every day merge to master
:check: Continues integration is possible
:check: developers are able to see what other developers are doing without rebase or merges
:red_cross: unstable master branch
