Bug 511730 - Disabled main screen when resolving Git conflicts
Summary: Disabled main screen when resolving Git conflicts
Status: REPORTED
Alias: None
Product: kdiff3
Classification: Applications
Component: application (other bugs)
Version First Reported In: unspecified
Platform: Other Linux
: NOR normal
Target Milestone: ---
Assignee: michael
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2025-11-06 19:15 UTC by Thiago Macieira
Modified: 2025-11-06 19:15 UTC (History)
0 users

See Also:
Latest Commit:
Version Fixed/Implemented In:
Sentry Crash Report:


Attachments
screenshot of kdiff3 (151.21 KB, image/png)
2025-11-06 19:15 UTC, Thiago Macieira
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Thiago Macieira 2025-11-06 19:15:26 UTC
Created attachment 186557 [details]
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.