[baq]

The branch is indeed unusable, as opposed to the whole repository being unusable - it's a very nice upside actually.

[yencabulator]

Making a local worktree/shallow clone is dirt cheap, if you're worried about `git rebase` not storing its state in a restartable fashion.

jj's handling of merge conflicts is pretty much like in Git committing the conflict markers in git and editing the commit message to say "conflicting".