Contents

Merging differences

Comparing is one half, taking over is the other. You do not have to decide in favour of one of the two files and discard the other: MergeQaiPro fetches individual blocks from one side to the other until the result is right.

4.1 Taking over a block

Between the two sides runs a narrow column of arrows. Each arrow belongs to one block of differences; clicking it writes that block to the other side. The direction is in the arrow itself — the tooltips read “Take this block to the right” and “Take this block to the left”.

Jump to the next difference with Ctrl+↓.
Read both versions and decide which one should stay.
Click the arrow pointing at the other side — or press Ctrl+→ or Ctrl+←.
Move on to the next block. Save at the end.

Screenshot 09: Merge arrows between the two sides; a block is being taken to the right — Fig. 09 — Merge arrows between the two sides; a block is being taken to the right

4.2 Undo and save

Every take-over can be undone: ↶ Undo in the bar or Ctrl+Z reverses the last block take-over — repeatedly, back to the original state.

Nothing is written until you say so. As long as a side carries unsaved changes, a marker points it out (“Unsaved changes”); the save button above that side writes this file (“Save this side”).

⚠️ Both sides are real files

Saving writes directly into the opened file — there is no clipboard and no backup copy. For important files, make a copy beforehand, or work with the three-way comparison (chapter 7), where the result goes into the base file and both source files stay untouched.

ℹ️ The comparison recalculates at once

After every take-over the comparison is recomputed: the finished block loses its colour and the counters in the footer go down. That way you always see how much is still open.