Jujutsu (jj)
DRAFT: This note is a draft. It is likely incomplete and may contain errors.
jujutsu (jj) is a version control tool built on top of git (there is an internal backend independent of git but it is to my understanding incomplete).
jj differs from git in a few meaningful ways:
- a new concept of a “change” is added which may be represented by multiple different underlying commits over time
- git’s “working copy” is done away with in favor of automatic snapshotting
- conflicts are first-class concepts and can be left in a change to be dealt with later