News for hackers. Stuff that matters.
Re:Jujutsu for Everyone by yencabulator on Monday September 01, 2025 @07:57PM (#45097695)
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".

There are no comments on this comment yet.