Terminology for referring to branches during merges and conflicts

[Martin Pool]

2010/1/16 Michael Gliwinski <Michael.Gliwinski at henderson-group.com>:
> 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.)

That would be good.  I think eventually, optionally, it would be nice
to go even further and actually do a kind of annotate operation to
explain _why_ the code on each side of the conflict is as it is - the
last change that touched it.


-- 
Martin <http://launchpad.net/~mbp/>