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.
Tony Hoyle wrote: > Because the merge has to take into account everything that happened from > the branchpoint you end up having to resolve possibly hundreds of > conflicts. Even the cleverness of cvs merging isn't going to cope well > with a branch that's got bits of old and new code mixed. btw. I get something like this merging the 2.5.x branch into the 2.6.x branch.. some features were backported so you get horrid conflicts sometimes.. last merge took 2 days to get right. Luckily this is still a one way merge - I'd never merge 2.6 into 2.5 *shudder* Tony