If I'm to use Tortoise-SVN in a situation where I'll be wanting to periodically merge from Trunk to Branch and also Branch to trunk, how should I be doing the latter?
The "Branch to Trunk" tutorials I've come across use the "Reintegrate a branch" command, but they only ever do it once. When I try and do it a second time, I get unexpected conflicts.
If I however use the "Merge a range of revisions" command, I can merge from branch back to trunk multiple times.
The docs say that a reintegrated branch is now useless, which I guess would explain the unexpected conflicts Im getting. But if using "Merge a range of revisions" allows more than one merge from branch to trunk, why use "Reintegrate a branch" that won't?
--reintegrate
more than once. For 1.6 and early reintegration can be performed only once