I have two development branches used to implement two variants of our core software. BRANCH_A contains many new features. BRANCH_B is a version of source code upgraded to use new versions of the compiler and several third-party libraries. Neither project is yet ready to be merged to the HEAD (trunk), yet the project in BRANCH_A wants the changes made in BRANCH_B. How do I do this merge, both initially and as we make additional progress in both branches?
Since it probably matters, we have created ROOT-OF-BRANCH labels in the HEAD to track the point in the trunk where the branches were cut. The initial merge would be to merge all changes from BRANCH_B into BRANCH_A so that it contains all changes necessary to support the new compiler, etc. We would then want to be able to merge any additional changes made to PROJECT_B after that initial merge. Thanks for your help! ...Jake -- Jake Colman Principia Partners LLC Phone: (201) 946-0300 Harborside Financial Center Fax: (201) 946-0320 902 Plaza Two E-mail: [EMAIL PROTECTED] Jersey City, NJ 07311 www.principiapartners.com _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
