https://bugs.kde.org/show_bug.cgi?id=501155
Bug ID: 501155
Summary: The resulting file is cleared of all content when
saving a resolved conflict
Classification: Applications
Product: kdiff3
Version: 1.12.1
Platform: Microsoft Windows
OS: Microsoft Windows
Status: REPORTED
Severity: critical
Priority: NOR
Component: application
Assignee: reeves...@gmail.com
Reporter: camc...@gmail.com
Target Milestone: ---
SUMMARY
When saving a resolved conflict, the resulting file is cleared of all content.
This behavior was introduced in version 1.21.1.
STEPS TO REPRODUCE
1. Create a merge conflict within a git repo.
2. Resolve the conflict using content from bother B and C panel allow with a
custom modification.
3. Save the resolved content.
OBSERVED RESULT
The file where the conflict occurred is now empty.
EXPECTED RESULT
The resolved conflict content to be saved to the file.
SOFTWARE/OS VERSIONS
Windows: Windows 11 24H2
macOS:
(available in the Info Center app, or by running `kinfo` in a terminal window)
Linux/KDE Plasma:
KDE Plasma Version:
KDE Frameworks Version:
Qt Version:
ADDITIONAL INFORMATION
--
You are receiving this mail because:
You are watching all bug changes.
