SVN-like merging (contrib)

[Sébastien Pierre]

Le mardi 09 mai 2006 à 09:44 -0700, Bryan O'Sullivan a écrit :

> >  It offers the following features :
> > 
> >  - Conflicts can be resolved in any order, at any time
> >  - Conflicts can be individually and independently resolved
> >  - Current version, parent version and newer version of each conflicting
> > file are saved as file.current, file.parent and file.newer.
> 
> I'd suggest using "local" and "remote" instead, or some other scheme, as
> using "current" and "newer" implies that one changeset is older than the
> other, which I can guarantee will cause confusion :-)

That is very true.

However, "local" or "remote" also imply that one changeset is not local,
which is not always the case. Maybe keeping things simple and using
".tomerge" (or ".merge") would be better ?

Does anybody has other propositions ?

 -- Sébastien