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.
Contents tagged with diff
Run kdiff3 file1 file2 -m -o file2 This will open kdiff3 to merge file1 and file2 and to save the results into file2. Resolve all the conflicts by choosing A or B for each conflict. Save, noting … more