Terminology for referring to branches during merges and conflicts

[Michael Gliwinski]

On Saturday 16 January 2010 04:21:40 Stephen J. Turnbull wrote:
> Ben Finney writes:
>  > Barry Warsaw <barry at canonical.com> writes:
>  > > I have to be honest, no matter how many times I work out
>  > > THIS/BASE/OTHER it never sticks in my head.
>  >
>  > I have no trouble with "THIS" and "OTHER"; they easily (and correctly)
>  > map to the two branches I'm already thinking about during the operation.
>  > I always have difficulty with knowing the referent of "BASE" though.
>
> BASE is presumably the most recent revision that is an ancestor of
> both branches.[1]  A graphical view of the tree should help with this;
> without that, I think it's very hard to visualize, with it, it's
> trivial.  YMMV but WFM.

When talking about annotating the conflict markers with branch nick, maybe for 
BASE it could be something along the lines of '(NICK @ REV)' where obviously 
REV is that common ancestor revision?


-- 
Michael Gliwinski
Henderson Group Information Services
9-11 Hightown Avenue, Newtownabby, BT36 4RT
Phone: 028 9034 3319

**********************************************************************************************
The information in this email is confidential and may be legally privileged.  It is intended solely for the addressee and access to the email by anyone else is unauthorised.
If you are not the intended recipient, any disclosure, copying, distribution or any action taken or omitted to be taken in reliance on it, is prohibited and may be unlawful.
When addressed to our clients, any opinions or advice contained in this e-mail are subject to the terms and conditions expressed  in the governing client engagement leter or contract.
If you have received this email in error please notify support at henderson-group.com

John Henderson (Holdings) Ltd
Registered office: 9 Hightown Avenue, Mallusk, County Antrim, Northern Ireland, BT36 4RT.
Registered in Northern Ireland
Registration Number NI010588
Vat No.: 814 6399 12
*********************************************************************************