Re: [darcs-conflicts] new approach to conflicts

I've put up a draft of some of the new conflict-handling ideas at

http://darcs.net/conflicts/paper/paper.pdf

which can be darcs gotten with

darcs get http://darcs.net/conflicts

in case you'd like to send a patch (particularly Igloo, Heffalump or
Arjan).  I wrote up some beginning of a discussion of what properties
trees representing patch sets ought to have, and there should be
something new there for everyone (even those who've been in on the IRC
discussions).
-- 
David Roundy