Terminology for referring to branches during merges and conflicts

[David Strauss]

On 2010-01-15 14:45, Barry Warsaw wrote:
> I have to be honest, no matter how many times I work out THIS/BASE/OTHER it
> never sticks in my head.  Conflict resolution is actually rare enough (for me)
> that the current terminology as presented to the user is always confusing.

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

-- 
David Strauss
   | david at fourkitchens.com
Four Kitchens
   | http://fourkitchens.com
   | +1 512 454 6659 [office]
   | +1 512 870 8453 [direct]

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 259 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100116/b2a1d789/attachment.pgp