RE: Reintegration a branch (not always seen as reintegrated)

> When a change is made to the release branch we merge in the changes
> from the release to the trunk. In many cases the code on the trunk has
> changed sufficiently to cause a conflict. When we resolve the
> conflict (using the "edit conflicts" option and then saving) and
> commit, everything seems fine. However, when we come to reintegrate

If you are merging from the release branch into trunk, you shouldn't
then do a reintegrate, as there is nothing to reintegrate.

Reintegrate is generally for a feature branch which you are merging to
from trunk. Once the feature is done you reintegrate that branch to
trunk and delete the branch.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1199133

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-20 17:20:58 CET