[journal] Deferred Conflict Resolution in Jujutsu

I try (and have mostly succeeded for the past year) to do daily, weekly, monthly, and annual reviews with a particular structure: wins, misses, learnings, mulling.

A very strange year: parts of it far exceeding my hopes, others falling rather flat.

My first-ever keynote! I am speaking at LambdaConf 2025, in May 2025, about open source software as a public good—indeed, as infrastructure.

TrainingPeaks Virtual (formerly IndieVelo) will only correctly send incline changes to the bike if it sees the bike primarily as a virtual trainer rather than as a power meter.

title: Why the Jujutsu posts are all about differences from Git subtitle: After all, it can do all the normal Git workflows, too… date: 2024-12-25T17:05:00-0700 qualifiers: audience: > Although…