To merge branched members in the GUI
1. Select the revisions you want to merge.
|
|
Revisions must be checked in prior to merging. An error occurs if the working file is modified and not checked in.
|
2. Select > > . The Merge Branch dialog box displays.
3. Specify the Target revision that the branch revision is merged into (typically the member revision on the trunk). You can specify a revision by name from the Symbolic list, specify a particular revision from the Revision list, or specify a revision by label from the Label list.
4. Specify the Branch you want to merge with the Target revision. You specify the branch by specifying a revision on that branch. All of the unmerged changes made on the branch prior to the specified revision are merged with the target revision. You can specify a revision by name from the Symbolic list, specify a particular revision from the Revision list, or specify a revision by label from the Label list.
5. To modify the Merge Branch options, click Options.
6. Under Change Package, select a change package to associate with the merged file from the Change Package list, or click Create to create a new change package for the file.
7. To merge the branch into the specified revision, click OK. To merge revisions of more than one member, click OK to All. Integrity Lifecycle Manager merges all the changes to the working file on the branch (from the point of branching up to the point of check in) into the member revision for the project.
You now have working files in your Sandbox that correspond to the results of the Merge Branch operation; however, they still need to be tested, then checked back into the trunk. Until the changes are checked in, other users cannot see or use them.
|
|
You can also merge branched members in the graphical Member History view by dragging the revision at the tip of the branch you want to merge onto the revision that you want to merge into.
|
