Branching Strategies: Git Flow, GitHub Flow & Trunk-Based Development

In this tutorial, you'll learn about Branching Strategies: Git Flow, Github Flow & Trunk. We cover key concepts, practical examples, and best practices.

Branching strategies define rules for creating and merging branches in Git, determining how your team ships features, handles hotfixes, and manages releases.

In this tutorial, you'll learn the three major Git branching strategies used by professional teams worldwide. Choosing the right branching strategy determines how smoothly your team ships features, handles hotfixes, and manages releases — a bad choice creates merge hell while a good one makes deployment routine. By the end, you'll know which workflow fits your project size, release cadence, and team structure.

flowchart TD
  subgraph GitFlow
    A[main] --> B[develop]
    B --> C[feature]
    C --> B
    B --> A
    A --> D[hotfix]
    D --> A
    D --> B
  end

Git Flow: The Classic Approach

Git Flow uses two permanent branches — main and develop — plus temporary branches for features, releases, and hotfixes. It was designed by Vincent Driessen in 2010 and works well for projects with scheduled releases.

# Create a feature branch
git checkout -b feature/user-auth develop

# Work and commit
echo "auth code" > auth.py
git add auth.py
git commit -m "Add user authentication"

# Merge back to develop
git checkout develop
git merge --no-ff feature/user-auth
git branch -d feature/user-auth

Expected output:

Merge made by the 'recursive' strategy.
 auth.py | 1 +
 1 file changed, 1 insertion(+)

Release branches prepare a new production release:

git checkout -b release/1.2.0 develop
# Bump version, fix last-minute bugs
git commit -m "Bump version to 1.2.0"
git checkout main
git merge --no-ff release/1.2.0
git tag -a v1.2.0 -m "Release 1.2.0"
git checkout develop
git merge --no-ff release/1.2.0

GitHub Flow: Simpler and Faster

GitHub Flow uses a single main branch with short-lived feature branches. Every feature branch becomes a pull request, undergoes review, and merges immediately to main for deployment. GitHub Flow is ideal for continuous deployment.

# Create feature branch from main
git checkout -b add-search

# Commit changes
echo "search feature" > search.py
git add search.py
git commit -m "Add search functionality"

# Push and create PR
git push -u origin add-search
# Open pull request on GitHub, get review
# Merge via GitHub UI, then delete remote branch

Trunk-Based Development

Trunk-based development has developers commit directly to main (the trunk) or use branches that last less than a day. Feature flags hide incomplete work. This strategy is used by teams like Google and Netflix for high-velocity deployment.

CI/CD pipelines are essential here — every commit triggers automated tests, and broken commits block the pipeline.

# Short-lived feature branch
git checkout -b add-header
echo "<header>Logo</header>" > header.html
git add header.html
git commit -m "Add site header"
git checkout main
git pull --rebase
git merge add-header
git push

Comparison Table

When to Use Each Strategy

Git Flow suits projects with versioned releases, like mobile apps or libraries. GitHub Flow works for web applications deployed multiple times daily. Trunk-based development fits mature DevOps teams with strong automated testing and feature flag infrastructure.

Common Errors

Practice Questions

Challenge

You join a team of 15 developers shipping a mobile app every two weeks. They currently use no branching strategy — everyone commits to main directly, causing frequent broken builds. Design a Git Flow branching model for them. Write the branch creation and merge commands for a typical feature cycle including a hotfix for a critical crash.

Real-World Task

Configure a GitHub repository with branch protection rules. Set up main as a protected branch requiring pull request reviews, status checks, and linear history. Create a feature branch, push it, open a pull request, and complete the merge workflow. Then optionally add a GitLab mirror with the same protection rules.

Built by the developers of Doda Browser, DodaZIP, and Durga Antivirus Pro.