[sa1]

There’s also gitbutler for this kind of workflow, a bit more visual.

[steveklabnik]

Yes, gitbutler is very cool. Scott is in the jj discord, and they’re jj fans in general. Lots of good cross pollination going on in this space!