[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merging from branch back into the trunk
From: |
Todd Breiholz |
Subject: |
Merging from branch back into the trunk |
Date: |
Fri, 23 Feb 2007 13:11:47 -0600 |
Several months ago, we created a branch for new development. We have
merged from the trunk to the branch several times since then. Next
week it will be time to merge the branch back into the trunk.
Is there anything special that I need to do to account for the interim
merges that were done, or can i merely do "cvs up -j BRANCH_NAME"?
Thanks!
Todd
- Merging from branch back into the trunk,
Todd Breiholz <=