Loading...
About Text Diff Merge
Merge two versions of text with interactive conflict resolution. Automatically detect and resolve conflicts with a user-friendly interface.
Features
- Two-way and three-way merge algorithms
- Automatic conflict detection with visual highlighting
- Interactive conflict resolution (Pick Left/Right/Both)
- Full undo/redo history with keyboard shortcuts (Ctrl+Z, Ctrl+Y)
- Conflict navigation with Ctrl+N
- Export to clipboard or download as file
- Synchronized scrolling with line numbers
- Support for large files (5000+ lines)
- Responsive design for mobile and tablet
- Git-style conflict marker generation
How to Use
- 1. Paste your left version in the first pane (labeled "Left / Ours")
- 2. Paste your right version in the second pane (labeled "Right / Theirs")
- 3. Click "Auto Merge" to automatically merge and detect conflicts
- 4. Review any highlighted conflicts in the merge result pane
- 5. Use "Use Left", "Use Right", or "Use Both" buttons to resolve each conflict
- 6. Use Ctrl+Z to undo or Ctrl+Y to redo any changes
- 7. Use Ctrl+N to navigate to the next conflict
- 8. Copy the result to clipboard or download as a file
Keyboard Shortcuts
- Ctrl+Z - Undo last change
- Ctrl+Y - Redo last undo
- Ctrl+N - Navigate to next conflict
- Ctrl+Shift+N - Navigate to previous conflict
Use Cases
- Merge different versions of code or documents
- Resolve git merge conflicts manually
- Compare and combine changes from team members
- Configuration file merging
- API response comparison and merging
- Document version reconciliation
Frequently Asked Questions
What is the difference between Left and Right?
Left is typically your version (Ours), and Right is the version you want to merge in (Theirs). The naming follows git merge conventions.
Can I undo my changes?
Yes! Use Ctrl+Z to undo any action, and Ctrl+Y to redo. The tool maintains full undo/redo history during your session.
How does conflict detection work?
The merge algorithm detects conflicts when both versions modify the same lines. When a conflict is found, it's highlighted with conflict markers (<<<<<<< and >>>>>>>) and can be resolved interactively.
Is my data secure?
Yes! All processing is done in your browser. No data is sent to any server. Everything stays on your machine.
Can I merge files with special characters or Unicode?
Absolutely! The merge tool supports Unicode, special characters, and handles different line endings (CRLF, LF) correctly.
What is the maximum file size I can merge?
The tool can handle files with 5000+ lines efficiently. Performance depends on your browser, but most merges complete in under 1 second.