https://bugs.kde.org/show_bug.cgi?id=457766
Bug ID: 457766
Summary: "Choose A for All Unsolved Conflicts" makes unexpected
changes
Product: kdiff3
Version: 1.9.5
Platform: Other
OS: Microsoft Windows
Status: REPORTED
Severity: normal
Priority: NOR
Component: application
Assignee: [email protected]
Reporter: [email protected]
Target Milestone: ---
SUMMARY
After making a manual change, Using "Choose A for All Unsolved Conflicts" makes
unexpected changes/deletes whole lines from the manual change.
This is really frustrating and on several occasions has lead to broken merges
when not caught before push.
***
NOTE: If you are reporting a crash, please try to attach a backtrace with debug
symbols.
See
https://community.kde.org/Guidelines_and_HOWTOs/Debugging/How_to_create_useful_crash_reports
***
STEPS TO REPRODUCE
1. Start merging two files with multiple changes
2. Manually resolve a change by editing the conflict line directly
3. Move to the next change, select from the menu: "Choose A for All Unsolved
Conflicts"
OBSERVED RESULT
Changes from step 2 are replaced with additional the changes from A.
EXPECTED RESULT
Nothing is done for conflict lines marked with M manual change.
SOFTWARE/OS VERSIONS
Windows: Window 10 21H2
Qt Version: Unknown
ADDITIONAL INFORMATION
I've heard reports from several others about this behavior being non-intuitive.
A warning or option to avoid this (off by default if necessary) would be much
appreciated.
--
You are receiving this mail because:
You are watching all bug changes.
