Related Topics:
Related Topics:| Merging Defined | Resolving Differences Between Files Using Merging |
In the Merging window, you'll find the following components:
| File Menu | Provides commands for opening and saving files. |
| Edit Menu | Provides commands for managing differences. |
| Navigate Menu | Provides commands for moving between the differences in both files. |
| Options Menu | Provides commands to set merge and scrolling options. |
| TeamWare Menu | Provides commands to start other TeamWare services. |
| Help Menu | Provides commands to enable the help viewer. |
| TeamWare Toolbar | Provides quick access to the file management operations: Open, Save, Mark, Undo. |
| Command Buttons | Provides quick access to editing and navigating operations: Accept, Next, Accept & Next. |
| TeamWare Window Status | Displays information about the state of your merge |
| Child Pane | The left, or child, file is loaded into this pane. Markings show where the file differs from the file in the parent pane or the ancestor. |
| Parent Pane | The right, or parent, file is loaded into this pane. Markings show where the file differs from the file in the child pane or the ancestor. |
| Merged Result Pane | The output, or results, pane displays a merged version of the currently loaded files. When files are first loaded, this pane shows only lines that are the same in both files. As differences are resolved, they are merged into the file in this pane. When all differences are resolved, the file in this pane is saved as the output file. |
| Navigate Pop-Up Menu | Click the right mouse button in the File pane to bring up commands for moving between the differences in both files. |