News for hackers. Stuff that matters.
Re:Jujutsu for Busy Devs by Filligree on Thursday July 24, 2025 @06:15AM (#44669002)
It does not, or at least not very well. Merges can't be rebased without replaying conflict resolution; since Git lacks a first-class concept of conflicts, that becomes a manual process.

Moreover, jj should be able (I haven't explicitly tried this) to autogenerate the conflict resolution in the `jj absorb` case, since it knows what the final post-merge state should be.

There are no comments on this comment yet.