| |
Open & Merge Files (2-Way) |
Opens 1st and 2nd files and then performs a 2-way merge.
|
 |
Merge Files (2-Way) |
Begins an interactive Merge process, opens the merge view for the current compare
files.
|
|
| |
Open & SureMerge Files (3-Way) |
Opens 1st and 2nd files and the parent file, then performs a 3-way SureMerge.
|
 |
SureMerge Files(3-Way) |
Begins a SureMerge process, enters File Open Dialog for parent file, smartly
merges all changes which don't conflict and then opens the merge view for the current compare
files to allow interactive resolution of any conflicting changes.
|
|
|
|
Open Conflict file |
Opens a Conflict file and begins a merge.
|
|
|
Open Saved Merge file |
Opens a Saved Merge file and resumes the merge.
|
|
 |
Save Merged File |
Saves the contents of the current merged view to the file specified.
The Saved Merge
file can be opened later to resume the merge.
The merge file can be Saved before you resolve all the changes. The
unresolved changes will have lines wrapped around them in the saved
file that look like this:
<<<<<<< C:\com\guiffy\guiffy\jiffy.dos
if( Curr_Firs < (50-1) ) {
=======
if( Curr_Firs < (CURMAX-1) ) {
>>>>>>> C:\com\guiffy\guiffy\jiffy.tre
|
See also: