News for hackers. Stuff that matters.
Re:Jujutsu for Everyone by hellcow on Sunday August 31, 2025 @06:06PM (#45087538)
It's not about "ignoring" conflicts. In jj you're often working with stacked diffs, and merge conflicts can impact a dozen "branches" all at once. This is trivial to resolve in jj and a nightmare in git. It lets you work on them one piece at a time and upon resolving it, instantly see the conflicts fixed across all your branches at once.

There are no comments on this comment yet.