Question

Is there any way from Cornerstone 2's UI to update a branch with changes made in the trunk after the branch was created?

Was it helpful?

Solution

Figured it out. In the working copy, I selected the branch's root directory and clicked 'Merge' from Cornerstone's top toolbar. From the merge interface, the 'Synchronize Branch' option is selected, and Cornerstone performs a "dry run" of the merge and displays a preview of all the files it will merge in from the trunk (there is a 'Merge From' box that defaults to the root trunk directory, ^/trunk). From here just clicked "Merge Changes" and branch was updated with all the changed files.

Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top