[Kdiff3-user] Auto-save and continue for 0 unsolved conflicts

[Brendan <br...@th...>]

Hi All

I regularly use KDiff3 to incorporate vendor changes to our customised
source files. So it's a 3-way merge, with the vendor's old version 4.6 as
A (Base), their new version 4.7 as B, our customised copy of 4.6 as C, and
the output is a newly customised version of 4.7.

If the vendors haven't touched a file that we've customised, then KDiff3
uses our old customised version automagically, which is great. When they
have updated a page that we haven't customised, KDiff3 automagically uses
the vendor's new version. Again, this is great.

And of course if the vendor has changed some lines of a file and we've
customised the same lines, then naturally KDiff3 needs to ask a human how
to fix it. Which is fair enough.

But when the vendor has changed some lines at the top of a file, and we've
customised some lines right down the bottom (so there's 0 unsolved
conflicts), it'd be great if KDiff3 could just do the merge and save,
without me needing to click OK, then save, then F7 again.

I have a few hundred files in these directories, and around 50 to 100
pages that we've customised are changed by the vendor each time, but
almost all are 0 unsolved conflicts. Usually there's less than a dozen
where I actually have to look at the lines and work out what to do. But I
have to click OK on the "Conflicts" box, then control-S to save, then F7
to continue again for all 50 to 100 changes, which is time-consuming.

Is there any chance KDiff3 could be changed to automatically save and
continue the merge, if there are 0 unsolved conflicts? Or if other users
don't want this to happen automatically all the time, would it be possible
to get a setting so that I can make it happen that way when I want it to?

Thanks,
    Brendan.