I am working on a long term branch. I want to update the trunk with the stuff in my branch every week or so.
I had been updating my branch from trunk using merge a range of revisions.
I then used reintegrate a branch to merge my branch back into trunk.
Then I went back to my branch and did merge a range of revisions and I got a ton of tree conflicts....
What is the proper way to do this? (keep trunk updated from another branch and keep that branch updated with trunk)
You should only keep your branch upto date with trunk. Then when you are ready to push your branch mods back into trunk it will only take the changes from your branch. Don't try to keep them both in sync with each other as you go along, you'll just get tied up in knots