Git Branching Strategies and Workflows Cheat Sheet

Updated 2026-03-18

Next Topic: Hexagonal Architecture and Ports and Adapters Architecture Cheat Sheet

Git branching strategies define how development teams organize, merge, and release code within version control systems. These strategies serve as operational blueprints that determine when branches are created, how long they live, who can merge them, and how changes flow from development through testing to production. The right strategy balances team size, deployment frequency, and release complexity—choosing poorly leads to merge conflicts, delayed releases, and deployment risk. While GitFlow dominated the 2010s with its structured multi-branch model, modern teams increasingly favor simpler approaches like GitHub Flow or trunk-based development that align with continuous delivery practices. Understanding the trade-offs between workflow complexity, integration frequency, and deployment automation is essential for maintaining code quality while shipping features rapidly.

What This Cheat Sheet Covers

This topic spans 15 focused tables and 75 indexed concepts. Below is a complete table-by-table outline of this topic, spanning foundational concepts through advanced details.

Table 1: Core Workflow ModelsTable 2: GitFlow Branch TypesTable 3: Branch Naming ConventionsTable 4: Merge StrategiesTable 5: Rebase OperationsTable 6: Integration PatternsTable 7: Pull Request WorkflowsTable 8: Branch Protection RulesTable 9: Hotfix WorkflowsTable 10: Environment BranchingTable 11: Conflict ResolutionTable 12: Monorepo StrategiesTable 13: Workflow Lifecycle ManagementTable 14: CI/CD Integration PatternsTable 15: Advanced Techniques

Table 1: Core Workflow Models

Model	Example	Description
GitHub Flow	`main` branch → feature branches → PR → merge → deploy	• Lightweight workflow with one stable branch and short-lived feature branches • ideal for continuous deployment where main is always deployable.
GitFlow	`main`, `develop`, `feature/`, `release/`, `hotfix/*`	• Structured workflow with multiple long-lived branches for versioned releases • separates ongoing development from production code with dedicated release preparation branches.
Trunk-Based Development	`main` branch → short-lived branches (<1 day) → frequent merges	• High-velocity model where developers commit to main daily with extremely short-lived branches • requires strong CI/CD and automated testing to maintain stability.
GitLab Flow	`main` → `pre-production` → `production` environment branches	• Hybrid approach combining GitHub Flow simplicity with environment-specific branches • code flows downstream through staging environments before production.

Table 1: Core Workflow Models

Model	Example	Description
GitHub Flow	`main` branch → feature branches → PR → merge → deploy	• Lightweight workflow with one stable branch and short-lived feature branches • ideal for continuous deployment where main is always deployable.
GitFlow	`main`, `develop`, `feature/`, `release/`, `hotfix/*`	• Structured workflow with multiple long-lived branches for versioned releases • separates ongoing development from production code with dedicated release preparation branches.
Trunk-Based Development	`main` branch → short-lived branches (<1 day) → frequent merges	• High-velocity model where developers commit to main daily with extremely short-lived branches • requires strong CI/CD and automated testing to maintain stability.
GitLab Flow	`main` → `pre-production` → `production` environment branches	• Hybrid approach combining GitHub Flow simplicity with environment-specific branches • code flows downstream through staging environments before production.