https://bugs.kde.org/show_bug.cgi?id=511730

            Bug ID: 511730
           Summary: Disabled main screen when resolving Git conflicts
    Classification: Applications
           Product: kdiff3
      Version First unspecified
       Reported In:
          Platform: Other
                OS: Linux
            Status: REPORTED
          Severity: normal
          Priority: NOR
         Component: application
          Assignee: [email protected]
          Reporter: [email protected]
  Target Milestone: ---

Created attachment 186557
  --> https://bugs.kde.org/attachment.cgi?id=186557&action=edit
screenshot of kdiff3

SUMMARY
Often (but not always) kdiff3 shows a main window with everything disabled and
fails to render any of the three sources. This is common with conflicts
launched by git mergetool, but doesn't require git mergetool (the same command
in the command-line has the same problem).

STEPS TO REPRODUCE
1. Create a conflict with Git rebase or merge
2. Run: git mergetool

OBSERVED RESULT
See screenshot. The application is not frozen, because it responds to Ctrl+Q
and shows a dialog. But the main window is completely disabled.

EXPECTED RESULT
The application shows the three sources and a potential merge.

SOFTWARE/OS VERSIONS
Operating System: openSUSE Tumbleweed 20251031
KDE Plasma Version: 6.5.1
KDE Frameworks Version: 6.19.0
Qt Version: 6.10.0
Kernel Version: 6.17.6-1-default (64-bit)
Graphics Platform: Wayland

ADDITIONAL INFORMATION
This seems to happen more commonly with the --auto command-line option.
Removing it usually makes kdiff3 work.

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to