Hello,
jdavidson wrote:I can't seem to figure this out.. I want to do the equivalent of svn merge ^/trunk where the effect is merging changes made in the trunk to a branch or branches.
Just make sure your changes are committed to the trunk, check out a working copy from the branch, right click on the root of the working copy corresponding to the branch, select
Modify -> Merge. In the first panel of the dialog
Merge select the option
Reintegrate a branch, press
Next and in the next panel in the
From URL field browse and select the URL of the trunk. In the
Target field you should have the working copy corresponding to the branch and you should not change it. Now press
Next to merge the changes of the trunk into the branch.
Regards,
Sorin