From version 260.1
edited by Simon Urli
on 2019/06/11
To version 261.1
edited by Simon Urli
on 2019/06/11
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -235,6 +235,7 @@
235 235  image:edit-conflict-force-save.png
236 236  {{/gallery}}
237 237  
238 +
238 238  We improve with {{info}}XWiki 11.5RC1{{/info}} the support of conflict edition by implementing a merge on save mechanism. This means that in case of conflict edition (two users saving the same document at the same time), instead of always displaying a window to the user asking what to do, we first try to perform a merge of both document. If the changes concerned two very different parts of the document (two different sections, an edit performed on an object against an edit of the content, etc) the user won't notice that a merge has been performed.
239 239  
240 240  Now, some conflicts might still occur if both users tried to edit the same part of the document. In that case, a new window is displayed asking the user what to do.

Get Connected