[Merge] Problem with merge very old feature branch back to the trunk

Hi dev,

I have problem, I have very old feature branch ^/branches/3.0.0 and i
can't reintegrate it into the trunk, because many of conflicts and tree
conflicts and i didn't port changes from trunk to this feature branch
(^/branches/3.0.0).

So the only way how can I merge this feature branch back to the trunk is
merge range of revision from this feature branch back to trunk.
I have tried port all changes from trunk to this feature branch ( was
success), but when i have tried reintegrate this feature branch back to
trunk, there was many problem, TortoiseSVN showed up me, that i didn't
merge some revision from trunk to this feature branch, so reintegrate
failed.

So I don't know how to merge changes from this old feature branch back
to the trunk. I have decided use "Merge range of revisions"

I have switched to the trunk to the head rev. and try to merge range of
revision from ^/branches/3.0.0. (Of course many conflicts and tree
conflicts)

Is this decide right ?

Thank you for any suggestions and advices.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].