Details
-
Bug
-
Resolution: Fixed
-
Major
-
16.10.10
-
None
-
Unit
-
Unknown
-
N/A
-
N/A
-
Description
When the next version is chosen for merging an attachment and the previous version has been deleted, the merge should always contain the next version even if a conflict is registered. Right now the conflict is registered but no attachment is added.
For a real life usecase impact, see CRAPP-394.
Attachments
Issue Links
- causes
-
CRAPP-394 Attachment might be lost when fixing conflict
-
- Closed
-
- is related to
-
XWIKI-23441 Merge fallback of xobjects is badly handled
-
- Closed
-