[cvsnt] Re: Branch merging - this seems wrong...

Tony Hoyle tony.hoyle at march-hare.com
Tue Jun 6 13:06:33 BST 2006

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.

Gerhard Fiedler wrote:
> Whenever I had to do such a merge, I didn't rely too much on cvsnt, though.
> I usually had four copies of the code in parallel during the merge, working
> on them with a three-way diff application:

Ouch. messy.

You're right though - you can't rely on the tool to handle that... once 
you go down that road it's an entire manual process.


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