branching
3 posts
- Trunk-Based Development with Release Branches A deep-dive into TBD + Release Branch — the hybrid Git branching model that combines trunk-based speed with release-grade stability. Covers workflows, release mechanics, hotfixes, conflict strategies, and Q&A.
- Git Merge vs Fast-Forward vs Rebase — A Visual Guide A deep dive into Git's merge strategies — merge commits, fast-forward merges, and rebases — with ASCII graphs, pros and cons, and guidance on when to use each.
- Trunk-Based Development vs Feature-Based Development A comprehensive comparison of TBD and GitFlow covering workflows, release mechanisms, conflict management, and framework upgrade strategies.