Skip to content

Branching Strategy

Jump to bottom
Eugenio Romano edited this page Oct 20, 2017 · 5 revisions 

                                                                    Release  o-----------------
                                                                             /
Master   o------------o-------------------o-------------------o-------------o-------------------
                       \                   \                 /             /
                        \          Hotfix    o-------------o              /
                         \                                   \           /
     Development          o--------------------o--------------o----o----o-----------------------
                                                \                 /
                                                 \               /
                      New-feature                 o-------------o

New feature branch is created from Development. The name convention followed for feature branch is:

git branch dev-{developerName}-{GitIssuedId/JiraIssueId}

Rebase vs Merge:

The convention that we are following in case you want to sync your feature branch with development is to rebase it against development, never merge development into your branch.

Clone this wiki locally