Regular updating of the trunk from my branch

Question

I am working on a long term branch. I want to update the trunk with stuff in my branch every week or so.

I updated my branch from the trunk using merge change range.

Then I used branch reintegration to merge my branch back into the trunk.

Then I went back to my branch and combined a series of changes, and I got a ton of tree conflicts ...

What is the right way to do this? (keep the trunk updated from another branch and save this branch with a trunk)

Answer 1

. , , . , ,

Answer 2

, , , :

• , , .
• , .
• ,

, , . Subversion , .

Answer 3

, . :

- , - ( +1 ). . . , ( !!!) .

release :

• Trunk → branch: - release. , , .
• → . , , . , .

, . ad-hoc.

,

-