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.
cvsnt-2.0.51d -----Original Message----- From: Tony Hoyle [mailto:tmh at nodomain.org] Sent: Wednesday, September 08, 2004 2:19 AM To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: Re: [cvsnt] Re: Merging a repository from Branch to Trunk Herb Croken wrote: > -every file that I checked had a similar conflict, with the author and the version: > <<<<<<< FormProcessor.java > * @version $Revision: 1.24 $ $Date: 2003/08/06 21:10:14 $ > * @author $Author: gb $ What server version are you using? Tony _______________________________________________ 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