Merge Branches (Source Menu)
See Also
Merge branches command may be very useful in collaborative development. After a project or file is branched for independent development in two development paths, you can use this command to merge changes made in the other development path with your own.
Before you perform the Merge Branches command, make sure you have selected the file that you want to merge changes into. The file you are merging changes from will remain unchanged.
Access Rights
You must have the Check In/Check Out access right in the project being merged into, and the Read access right in the project being merged from, to use this command.
Projects with independent branches
Shows all independent branches of the selected file. Select the branch you want to merge changes from.
For example,
Projects with independent branches:
$/C 1->5
--$/B 5->6
This means that there are 2 branches of this file; the first branch has moved from version 1 of the file to version 5, the second branch has the first as its parent (meaning that versions 1 through 5 of the file are the same in this branch), began its life at version 5 and was checked in once since then, moving it to version 6 currently.
Merge
Merges changes made in the selected branch into the file.
Close
Cancels the Merge Branches command and closes the dialog box.
Links
Shows all of the projects sharing the selected file.