Search a title or topic

Over 20 million podcasts, powered by 

Player FM logo
Artwork

Content provided by Jared Norman. All podcast content including episodes, graphics, and podcast descriptions are uploaded and provided directly by Jared Norman or their podcast platform partner. If you believe someone is using your copyrighted work without your permission, you can follow the process outlined here https://podcastplayer.com/legal.
Player FM - Podcast App
Go offline with the Player FM app!

Deferred Conflict (with Steve Klabnik)

43:01
 
Share
 

Manage episode 524519722 series 3645584
Content provided by Jared Norman. All podcast content including episodes, graphics, and podcast descriptions are uploaded and provided directly by Jared Norman or their podcast platform partner. If you believe someone is using your copyrighted work without your permission, you can follow the process outlined here https://podcastplayer.com/legal.

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

Jujutsu docs

Steve’s Jujutsu tutorial

“I see a future in jj” (Steve Klabnik)

East River Source Control (ERSC)

jj CLI reference

jj absorb

jj undo

Working with Gerrit (jj docs)

Git commit “trailers” / metadata

Git hooks

Git LFS

Perforce Helix Core

Sapling SCM

Mercurial

GitButler

The Rust Programming Language (“The Book”)

Steve Klabnik’s site

why the lucky stiff (Wikipedia)


Dead Code Podcast Links:


Mastodon

X

Jared’s Links:


Mastodon

X

twitch.tv/jardonamron

Jared’s Newsletter & Website


Episode Transcript


Hosted on Acast. See acast.com/privacy for more information.

  continue reading

60 episodes

Artwork
iconShare
 
Manage episode 524519722 series 3645584
Content provided by Jared Norman. All podcast content including episodes, graphics, and podcast descriptions are uploaded and provided directly by Jared Norman or their podcast platform partner. If you believe someone is using your copyrighted work without your permission, you can follow the process outlined here https://podcastplayer.com/legal.

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

Jujutsu docs

Steve’s Jujutsu tutorial

“I see a future in jj” (Steve Klabnik)

East River Source Control (ERSC)

jj CLI reference

jj absorb

jj undo

Working with Gerrit (jj docs)

Git commit “trailers” / metadata

Git hooks

Git LFS

Perforce Helix Core

Sapling SCM

Mercurial

GitButler

The Rust Programming Language (“The Book”)

Steve Klabnik’s site

why the lucky stiff (Wikipedia)


Dead Code Podcast Links:


Mastodon

X

Jared’s Links:


Mastodon

X

twitch.tv/jardonamron

Jared’s Newsletter & Website


Episode Transcript


Hosted on Acast. See acast.com/privacy for more information.

  continue reading

60 episodes

All episodes

×
 
Loading …

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.

 

Copyright 2025 | Privacy Policy | Terms of Service | | Copyright
Listen to this show while you explore
Play