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
Got this issue on
right click on the branch where you wish to merge (but getting this message) and select the option "update to revision" and then on the dialog which opens (screenshot below) select those revisions and click ok - once all previous revisions are merged, you wouldn't get this message
Adding this here to help someone who is using Tortoise SVN