Change comment:
Add edit conflict section
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. mslw1 +XWiki.surli - Content
-
... ... @@ -217,6 +217,14 @@ 217 217 218 218 If you force the lock then the last user who saves will overwrite the content with his version of the page. 219 219 220 += Edit conflict = 221 + 222 +Starting with {{code}}XWiki 11.2RC1{{/code}} we detect during the edition of a document if a conflict might happen when saving the page. 223 + 224 +{{image reference="warning_conflict.png"/}} 225 +If this warning occurs, this means someone edited and saved the document while you were working on it. 226 +Thus, in that case you need to copy the changes you made in the editor and open again the document in edition, to re-apply your changes. 227 + 220 220 = Extension page protection = 221 221 222 222 Since 10.3, extension pages are protected against editing ([[unless explicitly indicated otherwise in the extension>>http://extensions.xwiki.org/xwiki/bin/view/Extension/XAR%20Module%20Specifications#Hpackage.xml]]) to avoid mistake a user could make while still allowing advanced users to force it if really required.