Terminology for referring to branches during merges and conflicts

Michael Gliwinski Michael.Gliwinski at henderson-group.com
Fri Jan 15 15:48:29 GMT 2010


On Friday 15 January 2010 14:45:07 Barry Warsaw wrote:
> >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.)
>
> 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.

Yeah, exactly :D

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




More information about the bazaar mailing list