Branch: refs/heads/stable-17.4.x Home: https://github.com/xwiki/xwiki-platform Commit: 40349dfac947f275e6ca3ced53eeeca9b854967e https://github.com/xwiki/xwiki-platform/commit/40349dfac947f275e6ca3ced53ee… Author: Simon Urli <simon.urli(a)xwiki.com> Date: 2025-08-06 (Wed, 06 Aug 2025) Changed paths: M xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/src/main/java/org/xwiki/store/merge/internal/DefaultMergeManager.java M xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/src/test/java/org/xwiki/store/merge/internal/DefaultMergeManagerTest.java Log Message: ----------- XWIKI-23440: Merge fallback of attachments is badly handled * Ensure to properly record a conflict if current version of a doc doesn't contain an attachment which is present in previous and next versions and handle properly the fallback configuration (cherry picked from commit 5ffdf521abe7d891933a8070e9e592523cd8c030) Commit: 2a31a53e8a9b7b3d8e72bfda1d9c9673ddea92bf https://github.com/xwiki/xwiki-platform/commit/2a31a53e8a9b7b3d8e72bfda1d9c… Author: Simon Urli <simon.urli(a)xwiki.com> Date: 2025-08-06 (Wed, 06 Aug 2025) Changed paths: M xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/src/main/java/org/xwiki/store/merge/internal/DefaultMergeManager.java M xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/src/test/java/org/xwiki/store/merge/internal/DefaultMergeManagerTest.java Log Message: ----------- XWIKI-23441: Merge fallback of xobjects is badly handled * Ensure to properly record a conflict when an xobject is missing in current version but present in previous and next, and properly handle the fallback version (cherry picked from commit b2fe12b1eaebb8136b0452ebbc05f72edf697867) Compare: https://github.com/xwiki/xwiki-platform/compare/edc2831dea68...2a31a53e8a9b To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications