https://bugs.kde.org/show_bug.cgi?id=522164
Allen Winter <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Latest Commit|https://invent.kde.org/pim/ |https://invent.kde.org/pim/ |incidenceeditor/-/commit/55 |incidenceeditor/-/commit/99 |71f7a2b3408733413b472e2a1b3 |eccb56101ba94004f234d6cedf1 |b4cfd15dbb4 |17b8567cf82 --- Comment #6 from Allen Winter <[email protected]> --- Git commit 99eccb56101ba94004f234d6cedf117b8567cf82 by Allen Winter. Committed on 03/07/2026 at 14:50. Pushed by winterz into branch 'release/26.04'. Don't LLCONFLICT when moving an incidence to a new collection. We no longer prompt about an LLCONFLICT => we just overwrite Quoting vkrause: "the easiest way is to just not warn and just overwrite because anything smarter would need proper tracking on what exactly changed and then eg. update fields that haven't been changed since the last save with the new state" FIXED-IN: 6.7.3 (cherry picked from commit 5571f7a2b3408733413b472e2a1b3b4cfd15dbb4) M +8 -33 src/editoritemmanager.cpp https://invent.kde.org/pim/incidenceeditor/-/commit/99eccb56101ba94004f234d6cedf117b8567cf82 -- You are receiving this mail because: You are watching all bug changes.
