Git Branching Strategies

What are common Git branching strategies? Describe GitFlow or trunk-based development.

Gitbeginner

// interview question

What are common Git branching strategies? Describe GitFlow or trunk-based development.

Sample answer

Common strategies include GitFlow (feature branches, develop, release, and main branches with structured releases), GitHub Flow (simple feature branches merged to main with continuous deployment), and trunk-based development (short-lived branches or direct commits to main with feature flags). Trunk-based development is preferred for CI/CD as it reduces merge conflicts and enables faster delivery.

Why this matters

Branching strategies directly impact deployment frequency and team collaboration. DevOps engineers help teams choose and implement strategies that support their CI/CD goals. Understanding trade-offs helps optimize the development workflow.

Code examples

Common branch operations

bash

# Create and switch to feature branch
git checkout -b feature/add-login

# Keep branch updated with main
git fetch origin
git rebase origin/main

# Merge feature branch
git checkout main
git merge --no-ff feature/add-login

# Delete merged branch
git branch -d feature/add-login
git push origin --delete feature/add-login

Common mistakes to avoid

Long-lived feature branches causing merge conflicts
Not keeping branches up-to-date with main
Using complex branching when simple approaches would work

Likely follow-ups

What are the pros and cons of GitFlow vs trunk-based development?
How do feature flags enable trunk-based development?
When would you use a release branch?

Answer out loud first, then check yourself against the model answer.

Practice all Junior questions More Git questions

#git#branching#gitflow#trunk-based#cicd

Also worth your time on this topic

Interview

Git Rebase vs Merge

What is the difference between git rebase and git merge? When would you use each?

junior

Article

How to Abort a Merge Conflict in Git

Ran into merge conflicts and want to cancel the merge? Learn how to safely abort a merge and return your repository to its pre-merge state.

Checklist

CI/CD Pipeline Setup Checklist

Step-by-step checklist for a production-ready CI/CD pipeline: source control, builds, tests, security scans, deploy gates, secrets, and rollback paths.

1-2 hours

Git Branching Strategies

More Git interview questions

Also worth your time on this topic

Git Rebase vs Merge

How to Abort a Merge Conflict in Git

CI/CD Pipeline Setup Checklist