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.
It's not a warning message. It's simply a conflict that must be resolved by hand or using tools like ConflictEditor (http://sourceforge.net/projects/conflicteditor). Your project is *correctly* non-compileable, so you *must* resolve the conflict. What if you don't see the conflict and even though it allow you to compile the incorrect/conflicted file? Cheers, Alexandre. > -----Original Message----- > From: James Wilkinson [mailto:james at kudosdigital.com] > Sent: Thursday, October 23, 2003 7:25 AM > To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook > Subject: [cvsnt] Conflict text customisation > > > Hi all, > > While working on huge and complex software project, one of my > developers found that the product build was broken. > Unfortunately, the error from the build did not give many > clues as to the nature of the problem. The problem turned out > to be a CVS merge conflict (quite rightly) but the standard > conflict text of: > > > <<<< File.ext 1.4 > > Your changes > > ===== > > Other persons changes > > >>>> > > > caused strange build errors. > > > Obviously the developer should have spotted the "C for > Conflict" in the output log of WinCVS, but when updating a > lot of files, it's easy to miss one. > > > This problem could be helped immeasurable by a facility to > spit out custom text around the CVS conflict section, for example: > > #error CVS Conflict > > > Is it possible to configure/modify CVSNT to do this? > > ...or is does anyone know how to make WinCVS give an "in your > face" warning message when there were conflicts from an update? > > Regards, > James > > James Wilkinson > Senior Developer > Kudos Digital Group > _______________________________________________ > cvsnt mailing list > cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook > http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs >