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 xobject that has been deleted in current version, the merge result should contain a conflict and the new xobject. Right now the merge result doesn't contain any object and no conflict is recorded.
See CRAPP-395 for a real life usecase.
Attachments
Issue Links
- causes
-
CRAPP-395 Changes might be lost on objects when refreshing
-
- Closed
-
- relates to
-
XWIKI-23440 Merge fallback of attachments is badly handled
-
- Closed
-