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

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Barry Warsaw wrote:
>> On Dec 17, 2009, at 6:29 PM, Aaron Bentley wrote:

> The only issue is the flags you might pass to 'merge'. Like --weave,
> --reprocess, etc. Those tend to only get explicitly passed in complex
> merge scenarios. But you also only need to share state in... complex
> merge scenarios. :)

At least we should be able to detect whether the merge produced the
right content, by looking at the working tree's merge-hashes.

I guess we could just loop through all possible merge types :-)

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

iEYEARECAAYFAksr4CAACgkQ0F+nu1YWqI1MMQCbBmmN/pVrnwFe+Mj04gXaSxOg
W8cAmwdkHKpPtERiUOirChCZznci+Hs6
=umGL
-----END PGP SIGNATURE-----