Types of Merge

• 3-Way Merge: Compares a common ancestor (base) with two changed versions for automatic merging
• 2-Way Merge: Compares only two files for manual merging
• Fast-forward: Simple pointer move when changes exist on only one side

Merge Conflicts

Conflicts occur when the same location is modified differently in both files. Users must manually decide which version to keep.

Merge Editing in DiffMate

DiffMate supports bidirectional merge editing from comparison results. Select content from left or right panels to create your final document and download it instantly.