Throughout Heaven and Earth, Is Jujutsu Alone the Honored One? (A Gentler Way to Work With Git)

Most of us use Git every day, and most of us have also fought with it at some point be it a messed up rebase, a detached HEAD, a stash we forgot about and whatnot

Jujutsu (jj) is a newer version control system that sits on top of Git and tries to fix the parts that trip people up, while still pushing commits normally to GitHub, so nobody on your team has to care that you switched.

In this talk I'll walk through what actually makes jj different, and why people who try it tend to stick with it. Roughly what we'll cover:

• The "working copy is just a commit" idea, and why that means no staging area and no stash

• What happens to your workflow when a merge conflict doesn't block you anymore

• The operation log, and being able to undo almost anything you did to the repo

• How rewriting a commit automatically rebases everything on top of it

• How it stays Git-compatible, and where it still falls short today (no submodules yet, pre-1.0 rough edges)

• Why the need of a new system when git suffices for most of the developer community

By the end you'll know enough to try it on one of your own repos and judge for yourself :D

Attendees will leave with a knowledge of :

1. How jj's working-copy-as-a-commit model removes whole categories of Git mistakes.

2. Why first-class conflicts mean nothing ever blocks, and resolutions carry forward on their own.

3. How the operation log gives you a real undo button for the whole repo.

4. What it takes to actually adopt jj alongside Git, and where it isn't ready yet.