How to Do a Three-Way Merge on Windows

Steps

1. Choose Files | New Comparison (Ctrl+E) and select Merge Files at the top of the Compare dialog. Pick the three versions of the file:
   • Left/theirs: the other person's version
   • Center/base: the version you both started from
   • Right/yours: your version
   • Output (optional): the file to save the merge result to. If you leave it empty, you choose where to save the result later.
   
2. Click Merge. The three versions appear side by side, with the merge result in the pane below. ExamDiff Pro merges these changes automatically:
   • a change made in only one version (a Non-Matching block) is taken from that version
   • the same change made in both versions (a Matching block) is taken once
   The status bar shows how many blocks of each kind there are.
3. Where both versions changed the same lines in different ways, the block is a Conflict, marked red. Until you resolve it, the merge result keeps the base version of those lines. Choose Navigation | Next Unresolved Conflict to go to it.
4. Pick the version to keep with Merge | Use Left, Use Center, or Use Right, or click the diamond button on that pane's diff bar. Use Left, Then Right and Use Right, Then Left keep both changes, one after the other. A resolved conflict turns green. The same commands also override any automatic choice. If none of the versions is right, type the text you want directly in the merge pane: in the video, the chosen 75.00 is changed to 70.00.
5. Choose Files | Save Merge Results (Ctrl+S) to save the result to the output file.