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

[John Arbash Meinel]

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


...
> Merging is the process of resolving the conflicting values between two
> trees.  Where this can't be done automatically, it must be done
> manually.  That's where you come in.  So you can see bzr considers the
> merge incomplete until the conflicts are resolved.

As a small side point, in talking with MySQL it seems that Bitkeeper's
'merge' operation would create a commit that could have conflicted
state. You could resolve some of the conflicts, commit again, and send
the data to someone else, so that they could help you resolve the rest
of the state.

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.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksq4FAACgkQJdeBCYSNAANwEwCfaRhxGOUWwF9tp1G+4yYu3oxk
frQAn0x3ncMHfen9bSEv1m4KBYMJEdat
=woUG
-----END PGP SIGNATURE-----