Merging multiple vendor branches

2002-04-01 Thread Danial
Hi, I'm trying to merge a tree into a branch but am having some problems. First of all, I have an already existing tree called X which I want to merge into Branch_X. (See diagram below) The developers will commit their code in X and I will do the merges into Branch_X. "Main" is a new tree which

Re: Merging multiple vendor branches

2002-04-01 Thread Greg A. Woods
[ On , April 1, 2002 at 10:47:58 (-0800), Danial wrote: ] > Subject: Merging multiple vendor branches > > This is what I tried to do but it will not work: > > First, I imported the two trees using the multiple vendor importing > method (Section 13.6 of the Cederqvist manual):