Conflict resolution workflow (was Re: Recipes vs. Looms vs. pipelines)

[Stephen J. Turnbull]

Aaron Bentley writes:

 > John Arbash Meinel wrote:
 > > So there is at least some precedent for tracking conflicted state in the
 > > repository. AIUI it is somewhat about 'scaling up', when the tree state
 > > is complex enough that it takes >1 person to figure out what is going on.
 > 
 > If we do decide to pursue this approach, it would be a good idea to read
 > up on how BK handles it.

And how Darcs handles it.  (Ie, the "exponential disaster" scenario.)