GIT - Branching strategy
Author: Kamil Łazarz
Problem context
In order to develop quality software, we need to be able to track all changes and reverse them if necessary. Version control systems fill that role by tracking project history and helping to merge changes made by multiple people. They significantly speed up work and allow us to find bugs more quickly.
Unfortunately, ill-fitting branching strategies may reverse our expectations, cause our work to be extended, and frustrate developers.
Therefore, it is essential to choose the right strategy considering the seniority of developers, delivery time, project type, and team complexity. Furthermore, we should fit our branching strategy into our environment structure.
Choosing a branching strategy
There are many branching strategies, and each has its pros and cons. The most popular ones are:
In LEOCODE we want to choose two of them, and build a good practice for them.
This part waits for SCG.
Source:
- Please stop recommending Git Flow!
- Branching strategies: Git-flow vs. trunk-based development
- Trunk-based vs. feature-based development
- CI/CD i trunk-based development - wdrażaj częściej i szybciej - SoftwareSkill.pl
- Trunk-based Development vs. Git Flow