1. "Walk through" differences
2. Adjust similar lines
3. Merging of differences
4. Save changes
1. "Walk through" differences.
For move through difference blocks in Visual Comparer you can use several ways.
First way - keyboard. In many cases this method very comfortable. With help of the keyboard you can makes all "walk", merge and synchronize actions.
For move through defferences use please next keyboard accelerators:
"Alt+Down", F8 - walk to next difference block;
"Alt+Up", F7 - walk to previous difference block;
- or -
"Ctrl+MouseWheel" - walk to next or previous difference block.
Second way - buttons on the synchronize toolbar:
Detailed description of all commands for Synchronize toolbar see, please here.
2. Adjust similar lines.
Synchronization of differences is the next step after comparing of the files.
Content of the difference block from one comparison pane may be moved to other, but in some situations arrangement of the lines may be not very nice. For example, in the picture below, lines with numbers 486, 488, 489 in the left pane arranged with lines in the right pane not correctly:
Before merging differences you can do adujsting of the similar lines in both panes. Put the caret to different area (lines number 482 - 485 in the left pane on the previous picture) and press "Alt+PageDown" or invoke context popup menu at caret position and select "Adujst similar lines" menu command. After it, similar lines will be rearranged as on the next picture below:
... and the arrangement is much more better.
3. Merging of differences.
Now it's time to merge differences between files! As before, you can do merge operations with keyboard or Synchronize
toolbar. Also you can invoke context popup menu and select the menu item with appropriate merge command.
For merge defferences from one pane to other, use please, next keyboard accelerators:
"Alt+Right" - move the difference block from left pane to right pane;
"Alt+Left" - move the difference block from right pane to left pane;
"Ctrl+Alt+Right" - move only one (current) line in the difference block from left pane to right pane;
"Ctrl+Alt+Left" - move only one (current) line in the difference block from right pane to left pane.
4. Save changes.
After merging of differences in the files you can save your changes. Use "Ctrl+S" for save the file in active comparison pane or and for save appropriate files.
You can also select Save All , which saves both the left and right file, if you have modified them.
If you wish save the file in current active pane with a new name, press "Ctrl+Shift+S" or use File->Save As ... menu command. Dialog Save As will be appear and after save the file under new name current comparison pane will be switched to the new file.
If you try exit from Visual Comparer without saving, request dialog will be appear. In this case you have three alternatives - Save changes, Ignore without saving and Cancel exit from Visual Comparer.
Note, that after save the file(s), the Undo/Redo commands still available and you can do undo or redo of previous editing actions.