A Branching Strategy For You?
summary
Compares concrete branching models and when they actually work: Git Flow vs GitHub Flow vs trunk-based with clear criteria (release cadence, team size, CI/CD needs), shows Git internals like three objects per commit and the role of SHA-1 hashes, explains why default branch names change (master → main), and when trunk-based development succeeds (pairing, strong tests) versus when feature branches or release branches help. Gives practical, context-driven tradeoffs rather than vague advice.
AI-written summary · about
chapters (12)
- 0:00Welcome
- 1:09Speaker and Git basics
- 6:12Version control essentials
- 12:16How Git works
- 18:17Git branch importance
- 20:46Git Flow strategy
- 24:00GitHub Flow model
- 27:52Trunk-based development
- 32:49Branch naming history
- 35:04Future of version control
- 36:48Key takeaways
- 38:35AI in version control & Q&A
related talks
05mBranching Strategies Ultimately Determine Product Complexity
58mFeature Branches And Toggles In A Post-GitHub World
39mOur journey from Gitflow to Trunk Based Development
38mFeature Branching is Evil
50mFeature Branching considered Evil
44mBranch By Abstraction
35mIncrease Agility and Quality Using Trunk-Based Development in Continuou...
05mGit as a continuous manager