When you merge differences to the existing target content,
you can resolve differences individually by accepting specific changes
from the generated target content.
About this task
To resolve a specific difference:
Procedure
- In the Target pane, click
a file with differences to resolve. Files with differences are displayed
with a change decorator. The file opens at the bottom
of the window, with a pane for generated target content and a pane
for existing target content.
- Navigate to a specific change by using the Next
Difference or Previous Difference buttons,
or select a change in the Generated target content pane.
- To accept the selected change from the Generated
target content pane, click Copy Current Change
from Left to Right.
- Optional: To undo changes to the file up to
the last save, click Revert the Last Saved Change.
- Repeat steps 1 through 3 for each artifact with differences
to resolve.
- After all accepted differences are incorporated in the
target file, click Mark as Merged. You can
mark as merged the differences that you reject. You cannot end a merge
session until the changes in the Target pane
are marked as merged.
- To save changes to the file, click Save to
save changes to the file.
- Click OK.
Results
The merge session is completed and the
Merge the
Transformation Output window closes.