[cvsnt] Merging branches.

Tony Hoyle tmh at nodomain.org
Wed Mar 30 15:13:09 BST 2005


James Neave wrote:
> What does the -b switch do exactly? 

Merge from the branchpoint - re-merge everything even if it has been 
merged before.  You'll probably get a lot of conflicts that way... 
doesn't really scale with large projects.

> And how come not using still merges some stuff but not everything?

It won't merge anything that has previously been merged.

Tony



More information about the cvsnt mailing list