Here's the situation. We have a release branch that has been around way too long. At one point we did a release from it and around that time it was merged to trunk. There are about 100 commits to it since then. Some were merge outs from trunk, some were changes made directly in the branch. Some of these were merged to trunk, but some were not. Now I need to integrate trunk with the branch.
My choices are to merge out from trunk, resolve conflicts and then merge -reintegrate back to trunk, or just merge from the branch to trunk and be done. I am leaning towards the latter. Will the merge outs (from trunk to the branch) cause a problem when I try to merge back in? Does anyone have any advice besides making sure I do the merges in chronological order? JLM Jeremy Mordkoff Director, QA, IT & Release ZeeVee, Inc. One Monarch Drive | Littleton, MA 01460 Office: 978.467.1395 x233 | Fax: 978.467.1404 Mobile: 978-257-2183 j...@zeevee.com www.zeevee.com
