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.
Yang, Judy Bin wrote: > Instead of merge to the main trunk, we want to merge two branches to one > branch. Thanks. Merges are always performed on the local working copy and then committed to whereever the WC points. In most cases, you switch to HEAD (trunk) and merge from the branch. In your case, you switch to the branch you want to continue and merge the other branch. I would expect more than the usual number of conflicts, unless both branches were made very close to the same time. Probably the easiest thing to do is to take the branch that diverged first from the trunk then apply two merges: 1) from trunk to the point where branch2 diverged 2) from branch2 to the tip of branch2 HTH John