Details
-
Bug
-
Resolution: Solved By
-
Major
-
None
-
1.18
-
None
-
None
-
Unknown
-
N/A
-
N/A
-
Description
Reproduction steps:
- Create a page with a stylesheet xobject containing something like:
.content { color: red; }
- Edit the object to change red to black and save the change in a new change request
- Return to the page and delete the xobject
- Return to the change request
Expected result:
- the CR should display a conflict and the default resolution should be to keep the xobject with the provided changes
Obtained result:
- the CR doesn't display a conflict but only proposes to refresh the changes, which lead to entirely loosing all changes
Attachments
Issue Links
- is caused by
-
XWIKI-23441 Merge fallback of xobjects is badly handled
-
- Closed
-
- is related to
-
CRAPP-394 Attachment might be lost when fixing conflict
-
- Closed
-