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

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAksq8WIACgkQ0F+nu1YWqI2F2gCfSfx1dv+VdDipYKX/47ehlRBy
oxwAn3ubNmenRwfFdYXQxSxuEw54/pyV
=HsMs
-----END PGP SIGNATURE-----