Is there any way from Cornerstone 2’s UI to update a branch with changes made in the trunk after the branch was created?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Is there any way from Cornerstone 2’s UI to update a branch with changes made in the trunk after the branch was created?
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.