>
> develop branch is not merged directly with master branch. It' merged
> through a release branch because of the above practical reason.
>
@Chan: Yes, you are correct. The "develop" branch is not directly merged to
the "master", but "release" branches are supporting branches a limited life
time and should eventually be removed. Therefore the "release" branch needs
to be merged with the "develop" branch once it is ready to merge into
"master".
Also "Feature" branches are not merged to the "develop" branch unless the
feature is to be added to the upcoming release (as mentioned in the blog):
*"The essence of a feature branch is that it exists as long as the feature
is in development, but will eventually be merged back into develop (to
definitely add the new feature to the upcoming release) or discarded (in
case of a disappointing experiment)."*
On Thu, Mar 27, 2014 at 10:31 PM, Chan <duli...@wso2.com> wrote:
> +1 to follow the above model. Small note on the Release branch - features
> are not assigned to versions until it's decided. Features are built in
> topic branches and gets merged to develop branch. Once we decide that 0.4
> version is going to come with features that are available in develop -we
> branch off a release branch. The release branch is use to stabilize the
> code base and fix minor bugs. The release branch get's merged to the master
> and develop branch. A small correction on Niranjan's note- develop branch
> is not merged directly with master branch. It' merged through a release
> branch because of the above practical reason.
>
> Cheers~
>
>
> On Thu, Mar 27, 2014 at 9:49 PM, Niranjan Karunanandham <niran...@wso2.com
> > wrote:
>
>> 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:///>
>>
>
>
>
> --
> Chan (Dulitha Wijewantha)
> Software Engineer - Mobile Development
> WSO2Mobile
> Lean.Enterprise.Mobileware
> * ~Email duli...@wso2.com <duli...@wso2mobile.com>*
> * ~Mobile +94712112165 <%2B94712112165>*
> * ~Website dulitha.me <http://dulitha.me>*
> * ~Twitter @dulitharw <https://twitter.com/dulitharw>*
> *~SO @chan <http://stackoverflow.com/users/813471/chan>*
>
--
*Niranjan Karunanandham*
Senior Software Engineer - WSO2 Inc.
WSO2 Inc.: http://www.wso2.com
M: +94 777 749 661 <http:///>
_______________________________________________
Architecture mailing list
Architecture@wso2.org
https://mail.wso2.org/cgi-bin/mailman/listinfo/architecture
