[cvsnt] Re: Merging a repository from Branch to Trunk

Tony Hoyle tmh at nodomain.org
Wed Sep 8 10:18:32 BST 2004


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.


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



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