The secrets of understanding 3-way merges

Have you ever wondered how modern source control systems manage to automatically merge different versions of a file? Were you ever curious about how it knows when to report conflicts to you? And did you ever question why automatic merges sometimes gets things wrong? I've met many programmers who do…

KDiff3's manual alignment will make you wish you'd never used another merge tool

Merging sucks. Especially when you are presented with a complete mess that you need to make sense of. But today I discovered a KILLER feature in KDiff3 that will ease the pain. A LOT! The problem is that diff tools are designed to find the minumum change needed to get…

I wish I knew this merging tip years ago

Your favourite colleague has been at it again. In their infinite helpfulness they have decided to rearrange a file into alphabetical order. Or maybe they have grouped things more logically. Or perhaps they just felt like the world should burn and have decided to randomise the order of the file…

Agile Estimation: Why T-shirt sizes are dumb

What do Agile Estimation and T-shirt sizes have in common? If you ask me, the only thing it has in common is that somebody somewhere is recommending using the one for the other. It is a dumb idea. Here is why it is a dumb idea. Let's say that over…