Working with the comparison
Comparing file1.txt and file2.txt resulted in the following compare
editor. This section demonstrates how to use the compare editor to resolve the
differences between the two files.
There are two parts to the compare editor's local toolbar. Move to the next
or previous change using the right group of local toolbar buttons.
-
Click the Select Next Change button . Observe how it selects the next difference.
-
Click the Select Next Change button a second time to go
to the next change.
-
Click the Select Previous Change button.
To merge changes from the left file to the right file and vice versa use the
left group of local toolbar buttons. There are four types of merges that can
be performed:
- Copy whole document from left to right.
- Copy whole document from right to left.
- Copy current change from left to right.
- Copy current change from right to left.
Typically the copy whole document actions are used when the entire file on
either the left or right can just be replaced by the contents of the other file.
The Copy current change buttons allow a single change to be merged.
-
Ensure that the second difference is selected (as shown
below):
-
Click Copy Current Change from Right to Left
.
Observe that the selected text from the right file is copied to the left
file.
-
Close the compare editor and choose Yes to save the
changes. Alternatively, save the changes by choosing File > Save
(Ctrl+S).