Re: cvs: php4 /ext/domxml php_domxml.c

On Sun, Aug 26, 2001 at 03:39:58AM -0600, Joey Smith wrote: > I can't get this to MFH because of the following conflict: > <<<<<<< php_domxml.c > /* $Id: php_domxml.c,v 1.67.2.1 2001/08/21 21:51:22 joey Exp $ */ > ======= > /* $Id: php_domxml.c,v 1.69 2001/08/26 11:36:27 joey Exp $ */ > >>>>>>> 1.69 > > I'm thinking the correct fix for this may just be to make this line: > /* $Id$ */ > > But I'm not 100% sure on that...anyone know? I think that will work, but the best solution is to maintain two separate trees and make use of the -R option where appropriate. -- Jon Parise (jon@csh.rit.edu) . Rochester Inst. of Technology http://www.csh.rit.edu/~jon/ : Computer Science House Member