To merge three files into a single file
When merging three files, one is considered a base file that the other two are derived from. With this assumption, the Editor is usually able to merge without asking you. The Editor does this using the following rules:
- If a difference exits between the two source files, and one is the same as the base file, then the Editor uses the one that is different from the base file.
- If both source files differ from the base file, but are the same as each other, then the Editor uses the new text from either source file.
- If all three files are different, then a conflicting change was made and the Editor has to ask which change to use. In this case, it is likely that you will have to merge the change manually.
- Choose Tools > Merge Files...
- In File1, enter the first variation of the base file. If you want to use a version from version control, enter the version number in the adjacent Version field.
- In File2, enter the second variation of the base file. If you want to use a version from version control, enter the version number in the adjacent Version field.
- In Base, enter the version of the file from which File1 and File2 files are derived. If you want to use a version from version control, enter the version number in the adjacent Version field.
- If you want to manually control every merge change, deselect Automatic. If Automatic is selected, the Editor asks you to control a change only if it encounters a conflict it cannot resolve.
- Click Merge.
- Use the Merge window to control merges. If you deselected Automatic, the Merge window appears for every change. If you selected Automatic, the Merge window appears only when the Editor encounters a conflict it cannot resolve. Listed below are the features of the merge window:
Skip
The Editor finds the next difference.
Help
Invokes help on the control panel.
Cancel
Aborts the merge, closing all merger windows.
File1
Copies the selected text from File1.
File2
Copies the selected text from File2.
Base
Copies the selected text from the base file.
All
Copies the selected text from all three files.
The first time you press this button, a dialog box appears asking you how you want to merge the three selections: in what order, with change bars around them, with comments in front, between, or after them, and so forth. The next time you press this button, the last values entered are used.
1 & 2
The first time you press this, or either of the next two, a button dialog box appears asking you how to merge the two selections from File1 and File2: in what order, with change bars around them, with comments in front, between, or after them, and so forth. The next time you press this button, it uses the last values entered.
1 & Base
This is identical to 1 & 2 except it merges the selections from File1 and the base file.
2 & Base
This is identical to 1 & 2 except it merges the selections from File2 and the base file.
ChangeBars...
Changes the way 1 & 2, 1 & Base, and 2 & Base buttons work, and invokes the same dialog box as the first time you press any of those buttons.
Automatic
Choose if you want the Editor to try to make merge changes without prompting you. Deselect if you want to manually control every merge change.
Related topic:
Copyright © 1999, Green Hills Software. All rights
reserved.