Details
-
Improvement
-
Resolution: Unresolved
-
Major
-
None
-
10.11.8
-
None
-
Unknown
-
Description
Steps to reproduce
- Enable extension conflict resolution in your profile
- Upgrade from version 6.4.8 to 10.11.8
Actual behaviour
- The wizard asks for conflict resolution for a few WebPreferences pages such as Sandbox.WebPreferences and Invitation.WebPreferences while these pages were not customized in the original wiki.
- NB: the wizard does not require any conflict resolution for most of the other pages that were not customized (eg Sandbox.WebHome)
Expected behaviour
- It would be more expected that the wizard does not ask for any conflict resolution in such cases.
Attachments:
- Sandbox.WebPreferences current exported from version 6.4.8 from a copied wiki (not exactly the target one)
- Sandbox.WebPreferences exported with history from version 10.11.8 from the target wiki
Attachments
Issue Links
- blocks
-
XWIKI-15672 ConflictType.MERGE_SUCCESS should be based on whether or not there is a difference between previous and current
- Closed