Jujutsu: A Git-Compatible VCS - Git Merge 2022

Channel:GitHub · Length:33:25 · Published:2022-10-18 · Views:16630

Watch on YouTube

Summary

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.

Why HN recommends it

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

I think this was the talk — HN, 2024

Testing, debugging & developer tools

Subtitles (excerpt)

um yeah so my name is Martin Von schweigberg I expected my speaker notes to be here somewhere um but yeah um I work for uh on Source control at Google and I'm going to talk about uh a project I've been working on for almost three years it's a git compatible VCS called Jiu Jitsu and in case you're wondering the name has nothing to do with jiu-jitsu kaisen the anime um it's called Jujitsu just because the binary is called JJ and the binary is called JD because it's easy to type um oh okay now there it is um so here's an overview of the presentation um first I'm going to give you some background about me and about the history of source control at Google and I'm going to go through the workflows and architecture of JJ um and then at the end I'll explain what's what's next for the open source project and uh and um our the integration at Google so background about me I after graduating I worked for Eric's son for about 70 years and while there I think it was it's fair to say I drove the immigration to get there from from clear case and I cleaned up some get three base scripts in my spare time then I joined Google and worked on a compensation app and for the last eight years I've worked on fig

On Hacker News

I think this was the talk: [VIDEO] I would like to know more about the first class conflict handling. That could potentially be useful for an application I have in mind but I need to understand the algorithms better. How does it compare to CRDTs or other merge strategies? — snthpy, 2024-07
I completely rewrote the README recently to be more "user friendly"; does it address some of your question? I'm not trying to be snarky, I'm genuinely interested in if the README is now tantalizing enough to make you interested: [LINK] But in short, it has a better UX than Git by a mile while remaining interoperable at the storage level, so you can use GitHub; it has many of the niceties of Mercu… — aseipp, 2023-11
Jujutsu started as author's personal project and now author's full-time project at Google. It's presented at Git Merge 2022: Jujutsu: A Git-Compatible VCS - Git Merge 2022: Video: [VIDEO] Slides: [LINK] — teleforce, 2023-08
I think those two things that arxanas mentioned are the biggest differences (i.e. working-copy-as-commit and conflicts in commits). I haven't used Sapling, but I suspect Jujutsu has better support for moving commits (and parts of commits) around without touching the working copy. Sapling, on the other hand, has much better support very large repositories, since they've spent a lot of time on that… — martinvonz, 2022-11

Related videos