3 ms·
This Git-compatibility-first approach makes Jujutsu seem like a stronger contender to replace Git than I've seen so far. I'm curious about its management of co
by pxc 3y ago
This Git-compatibility-first approach makes Jujutsu seem like a stronger contender to replace Git than I've seen so far.
I'm curious about its management of conflicts. I know that pmeunier has taken a lot of care to formally work out a theory of patches to drive Pijul, and that unsound or problematic notions of patches/conflicts can lead to serious problems— they say that's what led to all the performance problems with Darcs, right? I'd love if the comparison page on the repo wiki gave a little more detail than that Pijul's handling of conflicts seems 'similar'.
- arxanas 3y agoThere is a little more detail here: https://github.com/martinvonz/jj/blob/main/docs/technical/conflicts.md https://github.com/martinvonz/jj/blob/main/docs/technical/co... Storing the conflicts symbolically in this way lets you reproduce the conflicts later and even auto-resolve certain conflicts, but it doesn't address resolving the actual contents of conflicts. You could probably use Pijul as a jj backend and get the best of both worlds (if someone were to implement it).