> Working with branches is not completely trivial and requires a little > coordination between > committers, in particular in relation with branch merge > operations. In > order to avoid multiple > merge conflicts, each time we merge from the 1.2 branch to > the main trunk, > we should > (must?) tag the merged version on the 1.2 branch. Subsequent > merges should > use the tag > referring to the latest merged version of the branch. Also do > not forget to > publicly announce > a merge operation.
Are you implying that changes applied to the 1.2 branch should not be applied to the main trunk? That those changes should wait for a merge of the 1.2 branch back onto the main trunk? I have always found working with branches to be fairly straightforward once you have the branch checkout, etc. But I have rarely been able to escape merge conflicts. There is always something that throws cvs off when it merges, and I end up cleaning something up by hand. -Mark -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
