Terminology for referring to branches during merges and conflicts

[Michael Gliwinski]

On Monday 18 January 2010 15:20:32 Stephen J. Turnbull wrote:
> Michael Gliwinski writes:
>  > BASE it could be something along the lines of '(NICK @ REV)' where
>  > obviously REV is that common ancestor revision?
>
> Er, by definition it's on both branches.  Which nick?

I'd say the one of THIS branch (i.e. being merged to), same for REV.  Do you 
think that could be confusing?


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