News for hackers. Stuff that matters.
Re:Jujutsu for Everyone by skydhash on Monday September 01, 2025 @07:15AM (#45091729)
Are you using your editor or a special software/plugin for resolving conflicts. I used Sublime Merge in the patch, but now I’m using Magit+ediff. Resolving conflicts is quite trivial in that case. And I can always ‘rebase -i’ to revert some of the decisions I’ve taken.

There are no comments on this comment yet.