The DevSecOps Talks Podcast DEVSECOPS Talks #26 - Git Branching Strategies. Do's and Don'ts
Mar 29, 2021
Johan Abildskov, a consultant and author of 'Practical Git,' shares his insights on Git branching strategies. He strongly critiques the GitFlow model, highlighting its complexity and advocating for more tailored approaches. The conversation delves into the challenges newcomers face with version control, the importance of continuous integration, and best practices for managing branches effectively. Johan emphasizes optimizing workflows and enhancing collaboration within teams for better deployment outcomes.
AI Snips
Chapters
Books
Transcript
Episode notes
Branching Is A Tool, Not The Answer
- Branching is lightweight in Git but easy to overuse, which creates friction rather than solving problems.
- Treat branches as a tool, not a default; excessive branching often hides process issues that need fixing.
Full-Time Merger In ClearCase
- In ClearCase the organization had so many branches that a full-time job existed just to merge them with complex scripts.
- That painful experience motivated a preference for fewer branches in Git where merging is simpler.
Speed Tests To Reduce Branching
- Reduce branching by speeding up tests and integration so you can commit to the mainline confidently and often.
- If your regression suite takes too long, invest in automation so feature branches become unnecessary.
