[cvsnt] Conflict text customisation

James Wilkinson james at kudosdigital.com
Thu Oct 23 12:13:17 BST 2003


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.


Yes, what, or where, is an 'Automated Conflict Parser' ?

#error is only for C/++. A different string would be needed for other languages..

Thanks,
James

-----Original Message-----
From: Peter Crowther [mailto:Peter.Crowther at melandra.com]
Sent: 23 October 2003 11:58
To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook
Subject: RE: [cvsnt] Conflict text customisation


> From: Tony Hoyle [mailto:tmh at nodomain.org] 
> Putting #error in there will just break
> every language that doesn't use that macro, not to mention all the
> automated CVS conflict parsers.

True, but the original poster may be using Visual Studio only (for
example) and no automated conflict parsers.  On which subject, maybe
it'd be useful to get such a conflict parser going in their environment.
I've never used one; do folks have any recommendations?

		- Peter
_______________________________________________
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


More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook