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

[Barry Warsaw]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On Dec 18, 2009, at 02:12 PM, John Arbash Meinel wrote:

>So are you thinking to only have "bzr diff -r merge:" when there is an
>active merge in progress? I think Barry would also like to be able to
>see this information after the fact. (Though I'm not 100% sure.)

Yes, both during and before would be helpful.

- -Barry
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAEBCAAGBQJLK+M5AAoJEBJutWOnSwa/SKsQALehdl6cZm4sZkHaquYsxv9h
zuKI0SyFs7SzehwCEFv5r0y5aDpQCGW8pNsIR/AnSYSPYArMt0wy3Xq9EzKjzdI/
BHxaZYho8XYwZnJKV/asn21/x0tVEyRz+57YP9hsAT1TcTV56xDlvaI3zbiIK2iW
673DP0LTYOhFIqtrKchWUQ4GoF5GyjLe6WhTxa8A/hi1qoSlFxf1Ob9FtI4D6dbN
Isp6JkvQDnHaNjfDGhNVOKQ0/mXatornLlxzC4CzG9jmk8PHz83vNkd0tlg7NkZt
9C+7FMWowPjHlB8hSarnamZ4+gkvm+Baka4BDlxy6uJ0c3JX8wGpb8+Zsy01LTLO
0sOvWU75/nM5nhPoWv0GSaB/oSEEqKMLbsafdZwWqflAMP7FwzmKGhyWGS5pJz9I
5+nWd2IVcYum6ZNnJDGsnP9mw0wAX8vUdOa5KNHwJiOkFh+rpeCF0yPUZ6f3O5mn
u+XK/WOcMxCCenfeOVbBhZ445Aeb3oBh3fpL3KFlXbDU1HAG9AE7SnmVOyi4LQB2
fKOpCBjEyLAfX6ao6HYr5K92TbK61aITUJEQPzlc6RnBMy5HV2+zAlNLnUWz8hra
9k6Q0/uHCGXAzxMGV8ngpzGtsi9+w/LNJ8f27Bj4zlC2QegfR61laWY0Odn8AQn4
g6a9+hOzo76WKA1wPus7
=n7a1
-----END PGP SIGNATURE-----