Eclipse: Merging
In UCM, the merge operation is an integral part of the deliver operation and can also occur when you rebase your private work area.
About this task
Merging is the action of combining the contents of two or more files or directories into a single new file or directory.
In UCM, the merging of your work from your private work area to the target stream takes place during a deliver or rebase operation when VersionVault encounters differences that require your manual intervention.
In the VersionVault Compare/Merge view, three panes appear at the bottom of the window. Each pane displays a different version of the WelcomeToUCM.java file. The left pane contains the common ancestor version of the file. The middle pane contains changes made to the file by another developer. The right pane contains the changes you made to the file. Note that the line you changed in the file is highlighted in all three versions. To resolve the conflict between changes you made to the file and changes another developer made to the same line of the same file, you must manually merge the versions. You decide to accept the other developer's changes.
To merge:
Procedure
-
In the VersionVault Compare/Merge view, click
the
icon on the toolbar and
select . -
Note that the text in the top pane changes to reflect your selection.
Click the Save merge output icon
. - The Rebase message box indicates that all versions were successfully merged and checked out to the user_name_ccrctut_proj view. Verify that the Leave the rebase in its current state option is selected and click OK. Note that the merge is not permanent until you complete the rebase.
- Before completing the rebase, check your changes by selecting the WelcomeToUCM.java file and clicking Run As > Java Application.
- In the Rebasing:user_name_ccrctut_proj view, click the Complete the rebase operation icon in the toolbar. The Rebase message box indicates that the rebase has completed successfully.