[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merging Between Branches
From: |
Jake Colman |
Subject: |
Merging Between Branches |
Date: |
05 Mar 2002 13:17:23 -0500 |
User-agent: |
Gnus/5.090004 (Oort Gnus v0.04) XEmacs/21.1 (Channel Islands) |
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: address@hidden
Jersey City, NJ 07311 www.principiapartners.com
- Merging Between Branches,
Jake Colman <=