Re:Jujutsu megamerges for fun and profit
by adrianmsmith on Tuesday April 21, 2026 @08:46AM
(#47848014)
> Because jj's conflict resolution is fundamentally better
I don't know jj well so its merge algorithm may well be better in some aspects but it currently can't merge changes to a file in one branch with that file being renamed in another branch. Git can do that.
I don't know jj well so its merge algorithm may well be better in some aspects but it currently can't merge changes to a file in one branch with that file being renamed in another branch. Git can do that.
https://github.com/jj-vcs/jj/issues/47