Go offline with the Player FM app!
Deferred Conflict (with Steve Klabnik)
Manage episode 524519722 series 3645584
Jared interviews Steve Klabnik (Rust author and longtime OSS contributor) about JJ (Jujutsu), a newer version control system that can operate on Git repos via pluggable backends so you can adopt it locally without forcing teammates to switch, while getting a simpler, more flexible workflow. Steve explains JJ’s core shift: no staging/index—your working copy is effectively a mutable commit you shape as you work, making it easier to split, squash, and rewrite history without juggling Git’s extra layers and flags, and even “stash” becomes just more visible commits. He highlights JJ’s stable change IDs (so you can refer to work even as hashes change), its conflict model where rebases complete immediately and mark conflicted commits for later resolution (great for many parallel branches), and features like jj absorb (auto-placing review fixes into the right earlier commits) and jj undo (a full operation history that makes experimentation feel safe). Steve also teases work on a JJ-native collaboration/review product inspired by Gerrit-style patch workflows.
Links:
Jujutsu (jj) on GitHub
“I see a future in jj” (Steve Klabnik)
East River Source Control (ERSC)
Git commit “trailers” / metadata
The Rust Programming Language (“The Book”)
why the lucky stiff (Wikipedia)
Dead Code Podcast Links:
Mastodon
Jared’s Links:
Mastodon
Episode Transcript
Hosted on Acast. See acast.com/privacy for more information.
60 episodes
Manage episode 524519722 series 3645584
Jared interviews Steve Klabnik (Rust author and longtime OSS contributor) about JJ (Jujutsu), a newer version control system that can operate on Git repos via pluggable backends so you can adopt it locally without forcing teammates to switch, while getting a simpler, more flexible workflow. Steve explains JJ’s core shift: no staging/index—your working copy is effectively a mutable commit you shape as you work, making it easier to split, squash, and rewrite history without juggling Git’s extra layers and flags, and even “stash” becomes just more visible commits. He highlights JJ’s stable change IDs (so you can refer to work even as hashes change), its conflict model where rebases complete immediately and mark conflicted commits for later resolution (great for many parallel branches), and features like jj absorb (auto-placing review fixes into the right earlier commits) and jj undo (a full operation history that makes experimentation feel safe). Steve also teases work on a JJ-native collaboration/review product inspired by Gerrit-style patch workflows.
Links:
Jujutsu (jj) on GitHub
“I see a future in jj” (Steve Klabnik)
East River Source Control (ERSC)
Git commit “trailers” / metadata
The Rust Programming Language (“The Book”)
why the lucky stiff (Wikipedia)
Dead Code Podcast Links:
Mastodon
Jared’s Links:
Mastodon
Episode Transcript
Hosted on Acast. See acast.com/privacy for more information.
60 episodes
All episodes
×Welcome to Player FM!
Player FM is scanning the web for high-quality podcasts for you to enjoy right now. It's the best podcast app and works on Android, iPhone, and the web. Signup to sync subscriptions across devices.