A Merge Conflict Is Two People Being Reasonable
Most management books treat conflict like a bug you can just patch out with a single line of “active listening” […]
Tooling
Rebase and Merge Are Not a Moral Question
I’ve spent two decades staring at diffs in payment gateways, and if there is one thing I’ve learned, it’s that […]
The Commit Message Is for the Person Bisecting
It’s 3:00 AM, the production database is locking up, and you’re staring at a git log that looks like a […]
The Eight Git Commands That Cover Most Days
Most tutorials treat Git like a linear, polite conversation where you type a command, hit enter, and everything proceeds exactly […]
One Command to Get the Project Running
I once spent three days of a sprint trying to figure out why a critical payment gateway update was failing […]