[tuhopuu-devel] CVS merging.

[Chris Want]

Jonathan Merritt wrote:
> Hi Chris,
> 
> Thanks for checking.  Maybe it'll work next time.  I'm just excited that 
> I didn't screw up the *entire* repository at this point... :-)
> 
> btw: the -ko option is meant to turn off keyword substitutions.  I'm not 
> sure if I used it correctly, but it supposedly removes conflicts on 
> lines like this at the start of files:
> 
> # $Id: SConstruct,v 1.3 2004/05/30 05:46:18 jpgrad Exp $
> 
> Jonathan Merritt.

You are my new personal hero ... of the 300 conflicts I have to
fix each merge, over half are usually due to the id tags
(such a conflict is created every time the same file is
modified in both trees).

Cheers,
Chris