Details
-
Bug
-
Resolution: Fixed
-
Critical
-
1.4.5
-
None
-
None
-
Unknown
-
N/A
-
N/A
-
Description
Reproduction steps:
- Setup a wiki to use a minimum of 1 approver
- Create a document without approvers with Admin
- Edit that document and save change in a CR, specify a user approver in the modal when saving
- With admin manage the approvers of the original document and specify another user
- Go back to the change request, see there's a conflict, fix the conflict by chosing published version
Expected result:
- the conflict is fixed and there's no change anymore on the list of approvers
Obtained result:
- the conflict cannot be fixed and there's no information whatsoever about the problem
Attachments
Issue Links
- depends on
-
XWIKI-20698 MergeResult is missing information about location of conflicts
- Open
-
CRAPP-263 Upgrade parent to XWiki 14.10.7
- Closed
-
XWIKI-18908 Handle properly xobjects conflicts when merging documents
- Open
-
XWIKI-20702 Allow to chose the fallback version in case of conflict when performing merge
- Closed