Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: 626e1a7210e01097cdeea9cda081079b3fab71fd https://github.com/xwiki/xwiki-platform/commit/626e1a7210e01097cdeea9cda081… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2023-11-21 (Tue, 21 Nov 2023) Changed paths: M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/src/test/it/org/xwiki/edit/test/ui/InplaceEditIT.java M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml Log Message: ----------- XWIKI-21535: Content added by concurrent user editing is lost on "merge" if save and view is done after save and continue (cherry picked from commit 69d36e341c0568ffff0eb1c3059c59b4dc707f62)