Contents
Comparing three files (three-way)
Two people have edited the same file — each on their own, starting from the same version. Now both sets of work should come together. That is exactly what the three-way comparison is for: besides the two edited versions it also knows the base both started from — and can therefore tell who changed what.
7.1 The three columns
| Column | Role |
|---|---|
| Left | one edited version — stays unchanged |
| Base | the common starting version. It is also the result: this is where you take things over, and this file is what gets saved |
| Right | the other edited version — stays unchanged |
7.2 Change or conflict?
If only one side changed a place, the matter is clear — as a rule you want to keep that change. If both sides changed the same place differently, it is a conflict: a human has to decide. The footer counts them (“3 conflicts”) so you know how many decisions are still pending.
7.3 Resolving
Two buttons are available for each block: Left ▶ base takes the left version into the base, Base ◀ right the right one. The arrow always points at the target — the base in the middle.