How to Use Integrate to Branch
I have been trying to merge select revisions from a branch back into the trunk and so far am not having any luck. I have my branch project open and am trying to use the "Integrate To Branch" command found in the contextual menu of the changes panel. Primarily the files in the branch are new and are not in the trunk. When I run the integration, all of the affected files are marked red and are skipped. Is this the proper way to integrate select branch changes back into the trunk?
Please sign in to leave a comment.
I would love to see a tutorial/video on this.
Ran into additional problems. If I right-click on a individual changed file and select integrate to branch, it isn't skipped. Unfortunately, with the dry-run option checked, the file was added to my selected working copy anyway as well as placed in a completely incorrect directory path. Essentially, a directory was left off and a new hierarchy was added to my "trunk" working directory.