merging branches (sw)

2000-06-30 Thread Joerg Faschingbauer

 "Sandra" == Sandra Wittenbrock [EMAIL PROTECTED] writes:

SandraI created a branch a bit earlier than I should have. (The developers
Sandra were still all working on the build related to the branch, and checking  the
Sandra changes into the trunk.)

Sandra If I had merged the branch right away, would I then have been able to create
Sandra a branch with the same name further up the trunk?

You'd have to either delete the branch tag explicitly before using tag
-d, or use tag -F which overrides an existing (branch) tag.

Be careful to check that nobody has checked out the branch.

Joerg




merging branches (sw)

2000-06-29 Thread Sandra Wittenbrock



I created a branch a bit earlier than I should 
have.(The developers were still all working on the build related to 
branch, and checking the changes into the trunk.) 

If I had merged the branch right away, would I then 
have been able to create a branch with the name further up the trunk? 


Sandra


merging branches (sw)

2000-06-29 Thread Sandra Wittenbrock

   I created a branch a bit earlier than I should have. (The developers
were still all working on the build related to the branch, and checking  the
changes into the trunk.)

If I had merged the branch right away, would I then have been able to create
a branch with the same name further up the trunk?

   Sandra