Terminology for referring to branches during merges and conflicts (was: [RFC] How to better assist users in resolving conflicts)

[Michael Gliwinski]

On Thursday 14 January 2010 23:07:22 Andrew Bennetts wrote:
> I guess it'd be good if the inline conflict region labels matched the
> file suffixes too.  It doesn't help user confusion for the inline
> markers to use TREE/BASE-REVISION/MERGE-SOURCE, while the suffixes are
> THIS/BASE/OTHER.

+1

You're having to mentally map e.g. what is 'OTHER' anyways so it would seem to 
be better to have one set of keywords to map from :)


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