Branching strategies: choose wisely to minimise costs
summary
Argument: choosing a branching strategy changes measurable costs across repositories and roles. Evidence: Stack Overflow survey of 16,000 people shows many still lack source control. Tools and practices compared: git flow vs trunk with rebased topic branches, GitLab style per-environment branches, Linux-kernel patch/integration pipeline. Concrete actions that reduce cost: squash local checkpoints into single commits, use ephemeral integration pipeline branches to build packages (packagist or archives) and only publish releasable hashes.
AI-written summary · about
chapters (25)
- 0:00Start
- 9:05NO VCS
- 9:45NON-DISTRIBUTED VCS
- 12:04AGENDA
- 14:23TESTER
- 16:28PACKAGE BUILDER
- 17:39DEPLOYER
- 18:32INTEGRATOR
- 19:27BUG HUNTER
- 20:48PROJECT MANAGER
- 22:53MASTER
- 23:15PUBLIC vs LOCAL
- 23:57LONG-LIVED vs EPHEMERAL
- 25:30TOPIC BRANCH
- 26:47MERGE WORKFLOW
- 28:23REBASE WORKFLOW
- 29:28UNSTABLE TRUNK
- 30:53INTEGRATION PIPELINE
- 32:47LONE WOLF
- 33:10GIT FLOW
- 37:05SIMPLE GIT WORKFLOW
- 37:34WORKFLOW FOR AGILE TEAMS
- 38:34GITLAB FLOW
- 40:04GITWORKFLOWS
- 44:25TRANSITION?
related talks
44mBranch By Abstraction
52mFrom 0 $100 billion: Inside lessons on how to scale your dev workflow
48mIndustry Myth Busting
01h 21mTradeoffs in the Software Workflow
29mTrunk Based Development – Optimizing for Team Performance
34mYou only have to change one thing to do the DevOps
54mKeynote – Kent Beck
32mMerge Strategies at Scale: Developer Happiness Through Better Code-submission Workflows