Git Workflow Strategies

Describe some common Git workflows used in team environments. What are the pros and cons of each?

Gitbeginner

// interview question

Describe some common Git workflows used in team environments. What are the pros and cons of each?

Sample answer

Common workflows: 1) Feature Branch - each feature in its own branch, merged via PR. Simple and widely used. 2) GitFlow - uses develop, feature, release, and hotfix branches. More structured but complex. 3) Trunk-Based - short-lived branches merged frequently to main. Requires good CI/CD and testing. 4) Forking - contributors fork the repo, used in open source. Choose based on team size, release cadence, and CI/CD maturity.

Why this matters

There's no universally 'best' workflow - it depends on your team's needs. Trunk-based development is trending in DevOps-mature organizations because it encourages frequent integration and reduces merge conflicts. Feature branching is great for teams needing code review gates. GitFlow suits projects with scheduled releases.

Code examples

Feature branch workflow

bash

# Start new feature
git checkout main
git pull origin main
git checkout -b feature/add-login

# Work on feature, commit changes
git add .
git commit -m "Add login form"

# Push and create PR
git push origin feature/add-login
# Create PR on GitHub/GitLab

# After PR approved and merged
git checkout main
git pull origin main
git branch -d feature/add-login

Trunk-based development

bash

# Short-lived branch (1-2 days max)
git checkout main
git pull
git checkout -b small-change

# Make small, focused changes
git add .
git commit -m "Refactor auth module"

# Merge quickly (after CI passes)
git checkout main
git pull
git merge small-change
git push
git branch -d small-change