XWIKI-19180: In case of merge conflict choosing "Reload editors" won'…

…t refresh the content XWIKI-19181: The autosave doesn't behave nicely when a merge conflict occurs
xwiki · Jan 22, 2024 · b27c767 · b27c767
1 parent 1ba1762
commit b27c767
Show file tree

Hide file tree

Showing 11 changed files with 231 additions and 741 deletions.
diff --git a/...xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml b/...xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
diff --git a/...latform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml b/...latform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
diff --git a/...e/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java b/...e/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java