Git Flow Model

- Ritesh Ranjan

The right way to GIT

Agenda

• Understand Git flow once again
• Discuss some best practices 
• Conventions used in our team
• How GIT flow model is helpful
• Down streaming concept

Intro

• GitFlow is a branching model for Git, created by Vincent Driessen

• Parallel Development

• Collaboration

• Release Staging Area

• Support For Emergency Fixes
  

Principles

• Maintain separate stable branches: master, develop, Stage etc.

• Create temporary throw-away feature branches

• The master branch is most stable branch (deployed to Prod)

• Maintain a develop branch where feature branch patches are integrated

• Tag only stable versions in the master branch

Downstream concept

RULES

 

1.Primary Branches in creasing order of stream:

    master (PRODUCTION env)

    staging (staging env)

    develop

 

2. Direct checking disabled in Primary branches

3. All changes to up stream can go via Pull Request

4. All changes in will flow to downstream via auto merge

5. Use annotated tags for marking releases or other important points in the history

Git Branch Grouping

<branch>/<username>_desc

<branch_bug >/<username>_desc

<feature>/username_desc

e.g

perf/ritran_cluster_test

feature/anp_Zendesk

stage_hotfix/ritran_pwd_reset_fix

 

Thoughts !