Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Hello Bo, Wednesday, April 6, 2005, 6:49:51 PM, you wrote: BB> On Tue, 5 Apr 2005 18:42:09 +0200, Richard Wirth BB> <r.wirth at wirthware.de> wrote: >>File contents: >> >><<<<<<< Dmakefile >>;;; $Header: /home/cvs/repo1/Dmakefile,v 1.11 2003/10/16 14:28:07 me Exp $ >>======= >>;;; $Header: /home/cvs/repo1/Dmakefile,v 1.14 2005/04/05 13:01:57 other Exp $ >>>>>>>>> 1.14 >> >> >>This is the only conflict! So why is this a conflict at all?? BB> Hmm, if there *is* a modification in the same line on the two BB> revisions then this is per definition a conflict. CVS can hardly BB> decide that the conflict is too small to bother with, can it? No. The probleme here is, the difference is only in the expanded keywords (cvs generated text)! And on a regular update I have never seen this kind of conflict until now. -- Best regards, Richard mailto:r.wirth at wirthware.de