Git Best Practices: Branching and Merging
summary
Covers different Git branching and merge strategies used in projects and organisations, comparing approaches like merge vs. rebase and discussing when each worked well or poorly. Also explains trunk-based development and environment promotion as simpler alternatives within Continuous Integration and Continuous Delivery workflows.
AI-written summary · about
chapters (8)
- 0:00Introduction
- 7:11Git branching basics
- 13:35Gitflow pros and cons
- 23:50Long-lived branches scaling
- 29:15Trunk-based development
- 36:02Rebase vs merge
- 42:12Commit signing security
- 45:55Q&A
related talks
44mGit Branching Model
21mGit Good – How knowing git can make your life easier
01h 08mHow Effective Teams Use Git
01h 08mHow Effective Teams Use Git
46mGit Workflow Etiquette: Repository Organization for Clean Codebases
07mGit strategies for documentation
42mGit Fu Developing
35mAre You Agile? Then Don’t Beat Around the Bush!