Git - Enterprise Git Branching Strategy

1.Master—This is a highly stable branch that is always production-ready and contains the last release version of source code in production

2.Develop—Derived from the master branch, the development branch serves as a branch for integrating different features planned for an upcoming release. This branch may or may not be as stable as the master branch. It is where developers collaborate and merge feature branches

Apart from those two primary branches, there are other branches in the workflow:

•  Feature—This derives from the develop branch and is used to develop features.

• Release—This also derives from develop branch but is used during releases.

• Hotfix—This derives from the master branch and is used to fix a bug in the production branch that was identified after a release

1.On Creation of new Repository – default branch will be ‘master’

2.Once Developers starting their development, they will create ‘develop’ branch from ‘master’

3.Let’s say a BankApplication, have following modeules

·         User Module

·         Admin Module

·         Transaction Module

·         Tax Module

·         Loan Module

For example, for each module 1 developer is working they will create a ‘feature’ branch from ‘develop’.

4.Once implementation is completed, they will merge feature branches to develop branch.

5.Once Build the Develop branch, they will give code to testing. Once Tests are passed they will merge/create ‘release’ branch from ‘develop’

6.Once ‘release’ code is deployed into the production servers, after Go, ‘release’ branch will merge with ‘master’. So master branch will be the current stable version.

Share on Google Plus

About Unknown

This is a short description in the author block about the author. You edit it by entering text in the "Biographical Info" field in the user admin panel.