version-control

2 articles

Git history visualization showing a messy branch being cleaned up with interactive rebase into clean linear commits

Mastering Git Rebase and Interactive Rebase

A practical guide to git rebase and interactive rebase — covering when to rebase vs merge, squashing commits, rewriting history safely, fixing mistakes, and team workflows for clean commit histories.

Nov 13, 2022·5 min read

Diagram comparing long-lived feature branches with trunk-based short-lived branches

Engineering

Trunk-Based Development: Why Short-Lived Branches Win

How trunk-based development with short-lived branches reduces merge conflicts, speeds up delivery, and keeps the main branch always deployable.

Mar 30, 2021·4 min read

View all articles