Branching strategy
Using Git and the Git flow methodology/pattern, a development team can base their local and remote branches on two main branches: development and master.
The development branch is used as the default branch (also known as the trunk) and represents the next release source code until the set of features (branches) are completed and signed off by the development team. At this point, a release branch is created, and the final stabilization phase on the next release package uses the release branch as the base for all hot-fix branches for development. Each pull request from a hot-fix branch that changes the release version will need to be merged back into the development branch.
A general flow of the feature, development, and ...
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Read now
Unlock full access