Branching_Strategies

Branching Strategies

Popular branching models for different team sizes.

🌳 Overview

graph LR
    A[Branching Strategy] --> B[Git Flow]
    A --> C[GitHub Flow]
    A --> D[Trunk-Based]
    A --> E[GitLab Flow]

🔵 Git Flow

Best for: Scheduled releases, larger teams

Branches

Start Feature Branch

git checkout develop

First, switch to develop branch.

git pull origin develop

Get latest changes.

git checkout -b feature/user-auth

Create feature branch from develop.

Finish Feature Branch

git checkout develop

Switch to develop.

git merge --no-ff feature/user-auth

Merge feature with no fast-forward.

git branch -d feature/user-auth

Delete feature branch.

🟢 GitHub Flow

Best for: Continuous delivery, smaller teams

Branches

Create Feature Branch

git checkout main

Switch to main.

git pull origin main

Get latest.

git checkout -b feature-add-login

Create feature branch.

Work and Push

git add .

Stage changes.

git commit -m "Add login feature"

Commit work.

git push -u origin feature-add-login

Push branch.

Create Pull Request

gh pr create --fill

Create PR using GitHub CLI.

After Merge

git checkout main

Switch to main.

git pull origin main

Get merged changes.

git branch -d feature-add-login

Delete local branch.

🟡 Trunk-Based Development

Best for: High-velocity teams, continuous integration

Branches

Short-Lived Branch

git checkout -b quick-fix

Create short-lived branch.

git commit -am "Quick fix"

Make changes.

git checkout main && git merge quick-fix

Merge quickly.

Direct to Main

git checkout main

Work directly on main.

git pull --rebase

Rebase before pushing.

git push

Push directly.

📊 Strategy Comparison

💡 Choosing a Strategy

🔗 Related

• Creating Branches
• Merging
• Git Flow Details
• GitHub Flow Details

#git #branching #strategy #workflow