Library › Book 17 › Branching Strategies
Branching Strategies
1.1Why Your Branching Strategy MattersThe branching strategy your team uses is not a minor implementation detail. It determines how you manage feature development, when you run…1.2The Three Main Strategies at a Glance1.3GitFlow in DetailGitFlow, introduced by Vincent Driessen in 2010, uses two long-lived branches (main and develop) plus short-lived branches for features…1.4GitHub Flow in DetailGitHub Flow, popularized by GitHub itself, uses a single main branch. All work happens on feature branches that merge via pull requests…1.5Trunk-Based Development in DetailTrunk-based development takes GitHub Flow to its logical extreme. Feature branches live less than a day -- often less than a few hours…1.6Adapting Your Test Plan to the StrategyDifferent branching strategies require different test execution timing:1.7Transitioning Between StrategiesTeams often start with GitFlow and migrate toward GitHub Flow or trunk-based development as their automation matures. If your team is…1.8Interactive Exercise: Map Your Branching Strategy1.9Exercises1. Identify which branching strategy your current team uses (or the team at your last job). Write down the branch names and what each one…1.10Career Translation- Evaluated and recommended branching strategies (GitFlow, GitHub Flow, trunk-based) for a team of 12 engineers, aligning test execution…1.11Q&AInterview Depth CheckPrompt: Your company currently uses GitFlow with a two-week release branch stabilization period. The VP of Engineering wants to move to…