To Compare Files choose File -> Open&Compare Files. This enters the Open Files Dialog for the 1st and 2nd File pair. After selecting the files you want to compare, clickon Compare to perform the Compare.
To Cancel a file compare while its running, click on the Cancel button located on the right side of the status bar on the bottom of Guiffy's screen.
Guiffy's ComparEdit features can be handy for when you need to find a change made in one version of a file and include it in the other --- maybe a bug fix. You can Edit and Save either of the FileCompare split view's text. First, find the change you want to copy. Using the logical scrollers![]()
locate the change. Then, click on one of the Replace buttons, either
or
, to copy the change into the the text of the file you intend to update. Then, if thats all the changes you need to make, click on one of the Save As buttons, either
or
, to save the new file.
If you need to replace several change blocks, just keep repeating the locate and replace steps above. You can also make all sorts of other editing changes. To remove lines we recommend Selecting the lines and then click on the Mark as Removed button
. Doing it this way will keep your scrolling synchronized. If you delete the lines or use Edit/Cut, the vertical scrolling will not be synchronized.
Once a line has been removed, it will be displayed with a strikethru and look like this:
These lines are NOT written to the Saved file.To insert lines, place the cursor at the insert point and hit Enter. ComparEdit automatically prefixes the text for the view and adds a "filler" space to keep the scrolling synchronized.
On an Edit/Paste operation ComparEdit will add the "filler" spaces - But, will not add prefixes to the lines pasted - which are not needed when the text came from either of your current text views.
To do a simple 2-way merge, choose Merge -> Open&Merge Files(2-Way)...
OR, After comparing two files, choose Merge -> Merge Files. This enters Merge mode - A third window (the merge view) will appear above the compare view with a row of buttons below it for interactively choosing the merge content. Merge mode will position the Merge and Compare views at each change. Choose the merge content by pressing one of the 3 selection buttons.
After choosing the merge content for each change, Save the Merged File(Merge ->Save Merge File).
To Cancel a file merge while its running, click on the Cancel button located on the right side of the status bar on the bottom of Guiffy's screen.
While merging, Guiffy automatically advances to the next Attention. Clicking the AutoShift into [N]eutral will keep the merge on the current Attention after doing a "Keep" --- so you can do any editing needed. Then, click the AutoShifter back into [D] to set Auto Advancing back on and advance to the next Attention.
To do a smart 3-way merge, choose Merge -> Open&SureMerge Files(3-Way)...
OR, After comparing two files, choose Merge -> SureMerge Files. The File Open Dialog will appear to specify the parent file of the two files being merged. After you click on the SureMerge button in the Open dialog, Guiffy will perform a smart 3-way SureMerge ,automatically choosing the merge content for all the changes except those that require your attention, and then enter the interactive merge mode for your resolution of those changes.
If you make a mistake and keep the wrong file's content for a change, just go back to that change using either the choice list
or Next/Previous Difference logical scrollers
![]()
. The Merge button row will indicate the change has already been merged and looks like this:
Clickon the Undo button and then reselect the change contents for the merge.
The current merge block always has the little "spotlite" on it that looks like this:
Using the scollbar you can position the merge view away from the current merge block - But, the merge operation is always performed on the current block(and the spotlite sticks to it).
Sometimes, while merging a change you want to Keep Both --- But, reverse their order(with the changes from 2nd before those from 1st). Thats exactly what the special MergEdit Flip buttondoes.
Once a change has been merged, the changes NOT kept are displayed with a strikethru in each line that look like this:
These lines are NOT written to the Saved merge file.You can make all sorts of editing changes in the merge view. To remove lines use the Mark as Removed like during ComparEdits. The Removed lines will appear like the merge changes Not kept shown above. Inserting and pasting lines also work like during ComparEdits AND MergeEdit will keep the compare views filled/synchronized.
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
NOTE: Later, you can Open the Saved Merge file and finish your merge.
if( Curr_Firs < (50-1) ) {
=======
if( Curr_Firs < (CURMAX-1) ) {
>>>>>>> C:\com\guiffy\guiffy\jiffy.tre
To Compare Folders choose File -> Open&Compare Folders. This enters the Open Folders Dialog for the 1st and 2nd Folder pair. After selecting the folders you want to compare, clickon Compare to perform the Compare.
To Cancel a folder compare while its running, click on the Cancel button located on the right side of the status bar on the bottom of Guiffy's screen.
To filter the files compared and/or displayed in the Folder Compare use the Folder Compare
Ignore and
Show options. By default, file compares are verified by applying all the file compare options. Folder Compare Ignore options are available to avoid verifies or to perform binary (byte-by-byte) verification.
To Compare Trees - Folders and SubFolders(Recursively), select the Folder Compare Show Options "Show SubFolders (Recursively)". To "Explore" FileTrees and view subfolder compares, clickon [+] to expand and [-] to collapse.
To include the Size and Modified details in the FileTree view, select the Folder Compare Show Options "Show Details".
A Double LeftClick on a file in the FolderCompare Tree View performs a File Compare and opens another window for viewing the file compare. If the other file is missing, the compare will be performed with an "empty substitute".
A Double LeftClick on a folder in the FolderCompare Tree View performs a Folder Compare (replacing the current folder compare view). If the other folder is missing, the compare will be performed with an "empty substitute".
Will navigate back up the Tree View.
Synchronizing Folders includes operations such as copying or deleting files and/or sub-folders from one file tree to another. After these operations, some files may need to be merged - see the How to Merge Files above. To synchronize folders, after comparing the folders(in the Split Tree Views), select a file or folder - then, a rightclick will produce a PopUp Menu with choices for Compare, Merge(2-way), SureMerge(3-way), Copy, Delete, Rename, SaveAs, and Select All operations. The compare views are dynamically updated following copy or delete operations.
![]()
For Mac users, a mouse right-click is simulated by Control-click.
The Copy and Delete operations support multiple selections. Mulitiple files and/or folders can be selected via the PopUp Menu's Select functions or by using your mouse. The multiple selections do not have to be contiguous. Hold down the ctrl key and click to add the node to the current selection. Hold down the shift key to add a range of nodes.
For Mac users, to add the node to the current selection, hold down the command key and click.
See also: