[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Confusion with merging from the trunk and into the trunk
From: |
Artem Smelovsky |
Subject: |
Confusion with merging from the trunk and into the trunk |
Date: |
Thu, 1 Apr 2004 13:09:20 +0500 |
Hallo there,
Help me please.
I have a branch 'feedback'. I merged some changes into this branch
FROM THE TRUNK one time. And now I want to merge the changes from
the branch INTO THE TRUNK.
But I don't know how to make it properly:
1. cvs up -j feedback
2. cvs up -j feedback_merged_from_head -j feedback
where 'feedback_merged_from_head' - is a tag applied to the branch
after I've made the merge.
3. cvs up -j head_merged_to_feedback -j feedback
where 'head_merged_to_feedback' - is a tag applied to the trunk
after the merging to the branch 'feedback'.
--
Artem
- Confusion with merging from the trunk and into the trunk,
Artem Smelovsky <=