Adding Manual Merge Lines
You can use the Add Manual Merge Line action in the Project History view of the Integrity Lifecycle Manager client GUI to add a manual merge line between two project revisions. This action is available by default on the Project menu and shortcut menu in the Project History view.
To add a manual merge line between a target and source checkpoint:
1. In the Project History view, select > .
2. Select Add Manual Merge Line.
The Add Manual Merge Line window opens.
|
Alternatively, you can right-click the Project History view and select Add Manual Merge Line on the shortcut menu to open the Add Manual Merge Line window. You can also use the corresponding toolbar button to open the Add Manual Merge Line window. |
3. Specify the target checkpoint. 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 a source checkpoint. 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. Click OK.
In the Project History view, the manual merge line is displayed from the target checkpoint to the source checkpoint. Also the merge information is available on target checkpoint if you select the target checkpoint in the Project History view.
|
• If you had already selected a checkpoint in the Project History view before selecting Add Manual Merge Line, Integrity Lifecycle Manager considers the selected checkpoint as the target checkpoint in the Add Manual Merge Line window.
• If you had already selected two checkpoints in the Project History view before selecting Add Manual Merge Line, Integrity Lifecycle Manager considers the first selection as the target checkpoint and second selection as the source checkpoint revision.
|