No one else actually answered you - its patch theory is more advanced than the patch theory employed in darcs, operating on "pushouts" of files rather than file

No one else actually answered you - its patch theory is more advanced than the patch theory employed in darcs, operating on "pushouts" of files rather than files, which can contain ambiguous lines - the site doesn't seem to link to the paper anymore and I don't have it at hand. The upshot of this is that rather than stopping the world for "conflicts" (a real terrible misnomer that made people think they were some kind of error state rather than an ordinary part of merging) until they're resolved, "conflicted" states (i.e., ambiguous states, which are not an error!) are just another type of valid state a repository can be in after applying a set of patches (and then the resolution is just a patch that applies to the "conflicted" state). Once you know about it, it's obviously the correct theory, and "conflicts" being treated as an exceptional state is obviously wrong. However, I think this will take a few decades to trickle down into practice.