Source code branching strategy

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Source code branching strategy

teru
Are there any reasons why the source code repository is not following git-flow/GitHub flow as a branching strategy?

There are a lot of benefit of following a branching strategy (or model). It helps developers to manage source code versioning/branching. And usually master branch is used for the latest release version, so that new developers always get the latest release version as the result of the first cloning. etc...
 
I think git-flow fits better than GitHub flow for CONNECT SDK, but both are very popular now.

git-flow
https://github.com/nvie/gitflow

GitHub Flow
https://guides.github.com/introduction/flow/index.html

Teru
Reply | Threaded
Open this post in threaded view
|

RE: Source code branching strategy

matt w

I believe we are following these principals we just have one minor catch in that we have mirror branches (*/*_integration) which allows us to use jenkins CI to validate commits to the integration or development branches before merging them to the “master” branch.

 

CONNECT is our “master” branch, developers commit code (by merging pull requests) into CONNECT_integration. The CI jobs then validate the commits and merge them into CONNECT. Therefore we know CONNECT will always build and be stable. This same process is repeated for all of the release branches (4.2/4.2_integration, 4.3/4.3_integration), however those branches don’t enjoy the same level of activity as the CONNECT/CONNECT_integration branches.

 

Make sense?

 

From: teru [via CONNECT Forums] [mailto:ml-node+[hidden email]]
Sent: Tuesday, June 10, 2014 4:54 PM
To: Weaver, Matthew (CGI Federal)
Subject: Source code branching strategy

 

Are there any reasons why the source code repository is not following git-flow/GitHub flow as a branching strategy?

There are a lot of benefit of following a branching strategy (or model). It helps developers to manage source code versioning/branching. And usually master branch is used for the latest release version, so that new developers always get the latest release version as the result of the first cloning. etc...
 
I think git-flow fits better than GitHub flow for CONNECT SDK, but both are very popular now.

git-flow
https://github.com/nvie/gitflow

GitHub Flow
https://guides.github.com/introduction/flow/index.html

Teru


If you reply to this email, your message will be added to the discussion below:

http://connect-forums.3294226.n2.nabble.com/Source-code-branching-strategy-tp7579596.html

To start a new topic under CONNECT Developers, email [hidden email]
To unsubscribe from CONNECT Forums, click here.
NAML