Skip to content
PodSubs
ShowsPeopleGuestsJobsNewsEvents
More
BlogPodCred
Menu
ShowsPeopleGuestsJobsNewsEventsBlogPodCredNetworksSign in
Join nowSign in
  • Shows
  • People
  • Jobs
  • News
  • More
    • Guests
    • Events
    • Blog
    • PodCred
    • Networks
    Join nowSign in

Developer Voices

Developer Voices artwork

Solving Git's Pain Points with Jujutsu (with Martin von Zweigbergk)

Oct 9, 20251 hr 12 minAudio

Git might be the most ubiquitous tool in software development, but that doesn't mean it's perfect. What if we could keep Git compatibility while fixing its most frustrating aspects - painful merges, scary rebases, being stuck in conflict states, and the confusing staging area? This week we're joined by Martin von Zweigbergk, creator of Jujutsu (JJ), a Git-compatible version control system that takes a fundamentally different approach. Starting from a simple idea - automatically snapshotting your working copy - Martin has built a tool that reimagines how we interact with version control. We explore the clever algebra behind Jujutsu's conflict handling that lets you store conflicts as commits and move freely through your repository even when things are broken. We discuss why there's no staging area, how the operation log gives you powerful undo/redo capabilities, and why rebasing becomes trivially easy when you can edit any commit in your history and have changes automatically propagate forward. Whether you're a Git power user frustrated by interactive rebases, someone who's lost work to a botched merge, or just curious about how version control could work differently, this conversation offers fresh perspectives on a tool we all take for granted. And if you're working with large monorepos or game development assets, Martin's vision for the future of Jujutsu might be exactly what you've been waiting for. --- Support Developer Voices on Patreon: https://patreon.com/DeveloperVoices Support Developer Voices on YouTube: https://www.youtube.com/@DeveloperVoices/join Jujutsu (JJ): https://github.com/martinvonz/jj Jujutsu Documentation: https://martinvonz.github.io/jj/ Git: https://git-scm.com/ Mercurial: https://www.mercurial-scm.org/ Rust: https://www.rust-lang.org/ Watchman: https://facebook.github.io/watchman/ Google Piper: https://research.google/pubs/why-google-stores-billions-of-lines-of-code-in-a-single-repository/ Kris on Bluesky: https://bsky.app/profile/krisajenkins.bsky.social Kris on Mastodon: http://mastodon.social/@krisajenkins Kris on LinkedIn: https://www.linkedin.com/in/krisjenkins/

Audio and video play straight from the show's own hosting. PodSubs stores and serves no media.

Hosts and Guests

Nobody is credited on this episode yet.

Credit the people on this episode

Be the first to rate this episode

More episodes

All episodes
  1. Why Lisp Thrives In The Age Of AI (with Cameron Barré)

    Nov 11, 20261 hr 40 minAudio

    Earlier this year it looked like AI might kill programming language innovation. Coding agents were at their best in the mainstream languages with decades of training data, which made the barrier to adopting anything new...

    Credit the people on this episode

  2. How Would You Type-Check 30 Million Lines of PHP? (with Julien Verlaguet)

    Sep 25, 20262 hr 22 minAudio

    How would you manage 30 million lines of PHP? You can't rewrite it - you'd be fired long before you delivered. That was the problem facing Facebook around 2011, and their answer was to add a type system, giving birth to...

    Credit the people on this episode

  3. DuckDB And The Burden of Success (with Hannes Mühleisen)

    Aug 26, 20261 hr 46 minAudio

    Building something people actually want is supposed to be the happy ending. But it arrives with a bill attached: feature requests you didn't ask for, pull requests you'd rather not maintain forever, users demanding the...

    Credit the people on this episode

  4. The Enterprise AI Gap (with James Brown)

    Aug 12, 20261 hr 2 minAudio

    My guest this week is James Brown, an engineering lead at Schroders, and that's a useful vantage point - asset managers carry all the regulation and organisational weight of a bank, mixed with the first-to-market...

    Credit the people on this episode

  5. What If Every SQL Query Could Update Incrementally? (with Lalith Suresh)

    Jul 8, 20261 hr 5 minAudio

    There's a problem that's bugged the database industry since the 1980s: you run an expensive query over millions of rows, cache the result, and then a single new row arrives. Logically that's one small update, but most...

    Credit the people on this episode