Edit Conflict (11.x)

Last modified by Vincent Massol on 2024/11/19 16:14

 XWiki
 Requirements
 Idea
 

Description

11.2RC1 added a new feature: Edit Conflict

Ideally, instead of just a warning the merge would be done automatically or at least Conflict Resolution modal would appear to resolve the overlapping.

This page's purpose is to gather feedback for the addition of this feature and to gather proposals for improvements.

Requirements

UC: Always be able to save the user's content. Don't force the user to manually copy & paste his content or discard his content.
UC: If the user needs to copy his content, provide an easy way to do it.
UC: Allow dismissal/cancel of the modal.
UC: Showcase the changes between versions (both ways).
UC: Notify the user if there are changes (content, attachments, objects) on the page's version.

Things to consider: 

  • content vs. attachments vs. objects
  • timeouts vs. restarts vs. browser/user sessions vs. back 

Older iterations

Other ideas

Current

Ideas

XWIKI-175

 

Failed to execute the [groovy] macro. Cause: [startup failed: Script6106.groovy: 14: unable to resolve class XmlParser  @ line 14, column 12.     def xml = new XmlParser().parseText(cont)               ^  1 error ]. Click on this message for details.

  • Select options closer to the Save button, keeping context
  • User first sees the conflict in order to reach a conclusion

Current

Var 1

Var 2

Var 3 (with scrollbar)

Var 4 (no scrollbar)


 

Get Connected