There 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/techn

There 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).