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.
> 1) Repetitive merges from a branch requires special handling, because you only > want to apply changes that were not already made, see > > http://cvsbook.red-bean.com/cvsbook.html#Multiple_Merges Note that the above does not apply to cvsnt--see the discussions on "mergepoint". Mergepoint remembers where a file was last merged from another and uses that to correctly determine the common ancestor. Regards, Glen Starrett