SVN-like merging (contrib)

[Sébastien Pierre]

Le jeudi 11 mai 2006 à 18:14 +0200, Thomas Arendsen Hein a écrit :
> * Sébastien Pierre <sebastien at xprima.com> [20060509 20:46]:
> > For now, I found that Frédéric's "parent"/"current"/"other" is the most
> > attractive option, because it is consistent, unambiguous and feels
> > rather natural.
> 
> local, base and other are phrases commonly used in many places when
> talking about merging.

This would make sense, but then is the "base" the parent, or the common
ancestor of the merged version ?

If this is the case, then "parent/base/other" would be better.

 -- Sébastien