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

[Tony Hoyle]

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.

Tony