Guiffy: The Complete Guide to File Comparison and Merging

How to Use Guiffy for Fast, Accurate Diff and Merge

Overview

Guiffy is a file and folder comparison tool that provides fast, accurate diffs and merging for text files, binary files, and directory trees. Use it to compare versions, synchronize folders, and resolve merge conflicts with visual and command-line options.

Quick setup

1. Download & install Guiffy from the official site and choose the edition that fits (GUI, command-line, or both).
2. Associate file types you commonly compare (e.g., .txt, .java, .xml).
3. Configure performance: increase memory or enable multi-threading in settings for large files.

Basic workflow (GUI)

1. Open Compare — choose File Compare or Folder Compare.
2. Select items — pick left and right files or folders.
3. Run comparison — Guiffy scans and presents differences in a side-by-side view.
4. Navigate diffs — use Next/Previous buttons or the diff list to jump between changes.
5. Edit inline — make edits directly in either pane; unsaved changes are tracked.
6. Merge changes — use arrow buttons or drag-and-drop to accept changes from one side into the other.
7. Save results — save merged files or export a patch/diff file.

Handling merges and conflicts

• Three-way merge: Load base (common ancestor), local, and remote versions. Guiffy shows conflicts where both changed the same region.
• Resolve a conflict: Choose the desired block from base, local, or remote, or edit manually to combine them.
• Mark resolved and continue; save the final merged file.

Folder sync & bulk operations

• Folder Compare shows added/removed/modified files and supports filters (date, size, patterns).
• Sync options: copy left-to-right, right-to-left, or bidirectional. Preview actions before applying.
• Batch merge: run automated merges for non-conflicting files; review conflicts manually.

Tips for speed and accuracy

• Use an appropriate diff algorithm in settings — some algorithms handle moved blocks better.
• Ignore irrelevant differences: set whitespace, line-ending, or comment filters.
• Limit scope: compare subfolders or file patterns to reduce workload.
• Enable file caching for repeated comparisons of large repositories.
• Integrate with source control: use Guiffy as an external diff/merge tool in Git, SVN, or other VCS.

Command-line usage

• Basic compare: guiffycmp leftfile rightfile
• Folder compare: guiffycmp -dir leftdir rightdir
• Generate patch: guiffycmp -patch leftfile rightfile -o changes.patch
• Automate merges: script guiffy commands in CI to produce diffs or apply non-conflicting merges.

Troubleshooting

• If comparisons are slow, increase memory and enable multi-threading.
• For binary files, confirm Guiffy is configured to use binary diffing or treat as text when necessary.
• If line endings cause noise, enable automatic normalization or ignore line-ending differences.

Example short workflow (text merge)

1. Run three-way compare: base.txt, yours.txt, theirs.txt.
2. Jump to first conflict, choose content from “theirs”.
3. Accept unchanged hunks automatically.
4. Save merged.txt and run tests or build to verify.

(Date: February 6, 2026)