Git is a frustratingly useful tool that has many lesser known features that really should be on by default. Today I wrote about one of them: zdiff3. It makes merge conflicts easier to work through and frees you up for more important things.

<https:ductile.systems/zdiff3>