SUMMARY Help for --auto option says "No GUI if all conflicts are auto-solvable." -- but it still shows the UI with "Number of unsolved conflicts: 0" dialog, waiting for UI interaction. sample command line: /usr/bin/kdiff3 --auto --L1 base --L2 local --L3 other /tmp/~base.ts /tmp/~local.ts /tmp/~other.ts -o /src/[...]/myfile.ts STEPS TO REPRODUCE 1. Prepare 3 files for merge with all diffs auto-resolvable. Example: FILE1: foo bar FILE2: foo 1 bar FILE3 foo bar 2 2. run kdiff --auto FILE1 FILE2 FILE3 -o RESULT OBSERVED RESULT UI dialog is shown, saying "Number of unsolved conflicts: 0" -- and waiting for user to click "OK" EXPECTED RESULT No UI interactions needed, only command line SOFTWARE/OS VERSIONS Windows: macOS: Linux/KDE Plasma: Debian-based custom distro (available in About System) KDE Plasma Version: KDE Frameworks Version: Qt Version: ADDITIONAL INFORMATION
Git commit 34d36270c926a05e08391e623ecf3fae044c3a26 by Michael Reeves. Committed on 27/03/2023 at 16:41. Pushed by mreeves into branch '1.10'. Don't show confilcts dialog in auto mode when all are solved FIXED-IN:10.0.1 (cherry picked from commit ce272265a414b05ccd87110ab24dd3610c3d15e6) M +5 -3 src/mergeresultwindow.cpp M +1 -1 src/mergeresultwindow.h M +1 -1 src/pdiff.cpp https://invent.kde.org/sdk/kdiff3/commit/34d36270c926a05e08391e623ecf3fae044c3a26
Git commit 349ce6f1caf17fefad9598928c02026a4a6545d1 by Michael Reeves. Committed on 27/03/2023 at 17:08. Pushed by mreeves into branch 'master'. Don't show confilcts dialog in auto mode when all are solved FIXED-IN:10.0.1 M +5 -3 src/mergeresultwindow.cpp M +1 -1 src/mergeresultwindow.h M +1 -1 src/pdiff.cpp https://invent.kde.org/sdk/kdiff3/commit/349ce6f1caf17fefad9598928c02026a4a6545d1