-
Use jj instead of git. Check with
ls .jj/— if no.jjdirectory exists, fall back to git. -
Branching:
jj describe -m "type(scope): message"on@, thenjj bookmark create <name>andjj git push -b <name>. -
Before push:
jj git fetch && jj rebase -b @ -o main. Resolve conflicts locally, verify with tests, then push. -
Conflict resolution:
jj resolve --listto find conflicts, edit files to remove markers (<<<<<<</>>>>>>>), then squash resolution withjj squash(no--interactiveflag). No detached HEAD or rebase-in-progress state to manage. -
Undo:
jj op undoreverts any operation. Safe to experiment.