Terminology for referring to branches during merges and conflicts

[Barry Warsaw]

On Jan 16, 2010, at 03:26 AM, David Strauss wrote:

>Would you like help integrating crisscross merges into your workflow? :-)

Oh yes, definitely.  I'm already not having enough fun.

:)
-Barry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100118/f612b032/attachment.pgp