5 ms·
> 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'
by adrianmsmith 5mo ago
> 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.
https://github.com/jj-vcs/jj/issues/47 https://github.com/jj-vcs/jj/issues/47