Been using SVN branches with Tortoise 1.6. I\'ve been periodically merging the trunk into the branch to keep it up to date.
Today, I thought I\'d reintegrate the br
Something that worked for me in tortoise SVN: instead of merging all revisions from branch, choose specific range and manually select all your revisions from the branch.