Hands-on Demo – All Git Branch Models for Continuous Delivery

Hands-on Demo – All Git Branch Models for Continuous Delivery

Below is a summary of four commonly used Git branching models for Continuous Delivery (CD): GitHub Flow, GitFlow, Release Branching, and Trunk-Based Development (TBD). Each model is explained with an example workflow.

1. GitHub Flow

Key Features:

1. Simplified model with only main and feature branches.

2. Merges into main are production-ready.

3. Best for teams practicing Continuous Deployment.

Workflow:

1. Feature Development:

   • Create a short-lived feature branch from main.

   • Example:

   xxxxxxxxxx
   5
   1
   git checkout -b feature/add-login-page
   2
   
   3
   # Make changes
   4
   git commit -m "Add login page"
   5
   git push origin feature/add-login-page
   

2. Pull Request: Open a PR, review changes, and merge into main.

3. Automated Deployment: CI/CD automatically deploys the main branch to production.

Advantages:

1. Simplicity and speed.

2. Easy to use for smaller teams.

Challenges:

Limited support for long-term versions or multiple environments.

2. GitFlow

Key Features:

1. Structured branching with main, develop, feature/, release/, and hotfix/ branches.

2. Supports long-term development and versioning.

3. Best for projects requiring multiple releases and environments.

Workflow:

1. Feature Development:

   • Develop features on feature/ branches based on develop.

     xxxxxxxxxx
     5
     1
     git checkout -b feature/add-login-page develop
     2
     
     3
     # Make changes
     4
     git commit -m "Add login page"
     5
     git push origin feature/add-login-page
     

   • Merge into develop once complete.

2. Create a Release:

   • Create a release/ branch from develop.

     xxxxxxxxxx
     5
     1
     git checkout -b release/v1.0.0 develop
     2
     
     3
     # Update version
     4
     git commit -m "Prepare release v1.0.0"
     5
     git push origin release/v1.0.0
     

   • Finalize and merge into both main and develop.

3. Hotfix: Use hotfix/ for urgent production issues.

Advantages:

• Robust version control for complex projects.

• Clear separation of development, release, and production code.

Challenges:

High overhead for smaller teams.

3. Release Branching

Key Features:

• Maintains multiple active releases using release/ branches.

• Supports long-term versions and backports.

• Best for projects with strict release schedules or LTS versions.

Workflow:

1. Create a Release:

   • Create a release/ branch from develop or main.

   xxxxxxxxxx
   4
   1
   git checkout -b release/v1.0.0 develop
   2
   # Update version
   3
   git commit -m "Release v1.0.0"
   4
   git push origin release/v1.0.0
   

2. Stabilize and Deploy:

   • Apply bug fixes directly to the release/ branch.

   • Merge into main for deployment.

3. Hotfix:

   • Create hotfix/ branches from main for urgent fixes.

Advantages:

• Easy to manage multiple release versions.

• Clear support for LTS or patch releases.

Challenges:

Additional complexity due to multiple active branches.

4. Trunk-Based Development

Key Features:

• A single main branch with short-lived feature branches.

• Requires robust CI/CD to maintain stability.

• Best for teams practicing Continuous Deployment.

Workflow:

1. Direct Commit to main: For small changes:

   xxxxxxxxxx
   4
   1
   git checkout main
   2
   # Make changes
   3
   git commit -m "Small fix"
   4
   git push origin main
   

2. Short-Lived Feature Branches: For larger changes:

   xxxxxxxxxx
   7
   1
   git checkout -b add-login-page
   2
   # Make changes
   3
   git commit -m "Add login page"
   4
   git push origin add-login-page
   5
   git checkout main
   6
   git merge add-login-page
   7
   git push origin main
   

3. Automated CI/CD: Deploys every commit to main automatically.

Advantages:

• Fast delivery with minimal branching overhead.

• Encourages frequent and incremental updates.

Challenges:

Requires strong CI/CD practices and discipline.

Comparison of Branching Models

Choosing the Right Model

• GitHub Flow: For small teams focused on speed and simplicity.

• GitFlow: For teams managing complex, long-term projects with multiple environments.

• Release Branching: For projects needing strong version control and long-term support.

• Trunk-Based Development: For fast-moving teams practicing Continuous Deployment.