Terminology for referring to branches during merges and conflicts

[Michael Gliwinski]

On Friday 15 January 2010 02:20:56 Ben Finney wrote:
> If the nicks aren't guaranteed unique, I think it would be a mistake to
> try to use them for distinguishing branches in a comparison or for
> filename suffixes.

I don't think they should be used in place of THIS/BASE/OTHER for suffixes, 
but as Andrew suggested, they would be helpful (in addition to 
THIS/BASE/OTHER) as part of conflict markers in text conflicts.  In cases 
they are different, they could basically mean you don't have to do that 
mental mapping yourself (i.e. what is 'OTHER', etc.)


-- 
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
*********************************************************************************