▶

Jujutsu: A Git-Compatible Version Control System

GitHub · Talk · YouTube title: Jujutsu: A Git-Compatible VCS - Git Merge 2022
Why it's here

HN links it as the canonical talk on Jujutsu's design, especially conflict handling.

What it covers

Martin von Zweigbergk presents Jujutsu (jj), a Git-compatible VCS with undo, anonymous branches, first-class conflicts, automatic rebasing, and the working copy as a commit. He also covers plans at Google.