Compare and Merge Elements
There are two scenarios where the Compare and Merge Element action can be used. In both scenarios, the actual compare and merge will be done in the Eclipse Compare editor.
Compare and Merge Local element with the Endevor element from the same CA Endevor inventory location (Environment, Stage).
In the Eclipse Compare editor, you will be able to see the differences between the local and the Endevor element, but you can only edit and save the local element.
To compare and merge a local element with the Endevor element, follow these steps:
-
Right-click the local element you want to compare and merge.
Note: The Compare and Merge action is available only when the local element was edited or there was a synchronization conflict. These element statuses are marked with the appropriate signs and decorators next to the local element. - Select Compare and Merge Elements.
- (Optional) In case there is a conflict (Local Element is out-of-sync with the Endevor element), dialog will be displayed giving detailed information about the out-of-sync situation. There will be 3 options presented:
- Auto-merge: If this option is selected, plugin will attempt to perform an automatic merge. In case this is not possible due to a conflict, Eclipse Compare editor will be opened to perform a manual merge. This option has 2 sub-options under the Auto-Merge options section, but they are disabled in this case. This is because Local Element is merged in place and not added to Endevor, meaning only the "Only update Local Element" option is possible.
- Merge: Open Eclipse Compare editor to merge the Local element with the CA Endevor Element.
- Do not merge: this option is disabled for explicit Compare and Merge Elements action.
-
The Progress Information dialog is displayed and the compare editor is opened, displaying the source of the local element on the left and the source of the Endevor element on the right. Use this editor to merge the changes into the local element on the left.
Note:You can select multiple elements using Ctrl-click or Shift-click.
-
If you are satisfied with the merge, click the Mark as Merged button on the top right corner of the compare editor.
Note:The Mark as Merged button will update the local element’s status, setting it to be synchronized with the Endevor element.