Perhaps you've heard of the JJ VCS, a new VCS replacing git that makes commit discipline and dealing with stacked PRs a breeze. Perhaps you've read the same blog posts I have, about how great jj is and how easy it is to get started.
But it wasn't enough for me, and it might not be enough for you. I felt my productivity grind to a halt as I struggled with things that had become second nature after 15 years of using git. Even though I was told it would be easy, I dreaded for days the prospect of dealing with my first merge conflict.
But then I hit jj heaven, and my productivity reached new heights. If only I'd had first gotten to do deliberate practice of the major workflows, I would have gotten there much faster.
I created this workshop to save the rest of my team — and now the rest of the world — from the same learning pains I went through learning JJ.
This is not yet another blog post about the awesomeness of jj. It's a series of exercises — done in simulation in this tiny repo — to give you experience with all the major version-control workflows as fast as possible.
Author: Jimmy Koppel, Ph. D. LinkedIn Twitter Website
- Watch the intro video (<6m at 1x speed).
- Go through the slides, featuring a series of 8 exercises to take you from "Create a new commit" to "resolve merge conflicts in a stack of PRs." (1-2 hours for someone with no jj experience.)
- Watch the conclusion video (<6m at 1x speed).
Get stuck at any point? Watch the video solutions below
- Ex 1 and setup: https://www.loom.com/share/4fbd38673a884f62b89bbb43e746dfe8
- Ex 2: https://www.loom.com/share/e3e148f07fb9420180ebb047f5ca94b3
- Ex 3: https://www.loom.com/share/7a93da40b58242f68dadf55f92270dad
- Ex 4: https://www.loom.com/share/6957c171f8964b0aa514cfddbce19780
- Ex 5: https://www.loom.com/share/08463df850104cfc8060e91c4414dfdd
- Ex 6: https://www.loom.com/share/92d06fc19d734b7abb702bcc3481e6d6
- Ex 7: https://www.loom.com/share/1fb08fe0bef845baae3bffc969685628
- Ex 8: https://www.loom.com/share/5bd217cfab984f0b8836e62d1d5cf5a0