Everything you ever wanted to know about patch theory and conflictors:
Patch theory stuff
Current conflictors work
You probably want to grab this:
darcs get http://darcs.net/darcs-patch-theory
And see David's FOSDEM 2006 slides
- And from there, take a look at:
An explanation of mergers (and what conflictors were meant to be)
The darcs-conflicts
- mail list is dead. David should perhaps get the archives online (says Eric).
Permutivity - David's notes on the property of patches
See also
Understanding darcs - Wikibook attempt to explain darcs and patch theory very slowly and with lots of diagrams. Note: very incomplete.
Some maybe related work
- Operational transforms/SO6
http://web.comlab.ox.ac.uk/oucl/work/bill.roscoe/publications/33.ps