Hi all,
The blog [1] explains how the Git work flow works. Below I have summarized
what is mentioned in the blog.
This work flow consists of two main branches (Master and Develop) and 3
supporting branches (Feature, Release and Hotfix branches). The supporting
branches are used to allow parallel development between team members, ease
of tracking features, prepare for production releases and to help in
quickly fixing live production problems. Unlike the main branches which
have an infinite lifetime, the supporting branches have a limited life time
as they can be removed.
- *Master *(naming convention: "master") - This is the branch where the
source code is in production-ready state.
- *Develop *(naming convention: "develop") - This is the branch in which
the latest development changes for the next release are committed. When the
branch reaches a stable point and is ready for release, it will be merged
back into "master" and then tagged with a release number.
- *Feature Branches* (naming convention: anything except "master",
"develop", release-*, hotfix-*) - This is used to develop new features and
eventually will be merged into "develop" or discarded.
- Release branches (naming convention: "release-*") - This is used to
support preparation of a new production release like minor bug fixes and
prepare meta-data for a release. This is branched off from the "develop"
and must be merged back into "develop" and "master".
- Hotfix branches (naming convention: "hotfix-*") - This is created when
there is a critical bug that needs to be fixed in the released version
("master"). Once the bug is fixed, it needs to be merged to the "master"
and "develop" branches.
[1] - http://nvie.com/posts/a-successful-git-branching-model/
--
*Niranjan Karunanandham*
Senior Software Engineer - WSO2 Inc.
WSO2 Inc.: http://www.wso2.com
M: +94 777 749 661 <http:///>
_______________________________________________
Architecture mailing list
[email protected]
https://mail.wso2.org/cgi-bin/mailman/listinfo/architecture
