Welcome to Shaun Luttin's public notebook. It contains rough, practical notes. The guiding idea is that, despite what marketing tells us, there are no experts at anything. Sharing our half-baked ideas helps everyone. We're all just muddling thru. Find out more about our work at bigfont.ca.

Merge two files with kdiff3, starting from the command line.

Tags: diff, kdiff3, merge

Tuesday, June 2, 2015 2:24:22 AM

  1. Run kdiff3 file1 file2 -m -o file2
  2. This will open kdiff3 to merge file1 and file2 and to save the results into file2.
  3. Resolve all the conflicts by choosing A or B for each conflict.
  4. Save, noting that save will be grayed out  (disabled) until we have resolved all conflicts.

image