Affects Version/s: 10.8.1
Fix Version/s: None
Environment:Windows 10 Pro 64 bit, Chrome 70, IE11, Edge 17, Firefox 63, using a local instance XWiki 10.9
STEPS TO REPRODUCE
Preconditions: An older instance of XWiki (e.g. 9.11.8) and an instance of XWiki 10.8.1 (to which will be migrated) are available.
- Login to the older instance
- Create a new subwiki
- Close the instance
- Go to the newer instance (10.8.1) and copy/cut the
folder and replace it (first delete the old one) in the same location on the older version
- Start XWiki and follow the Distribution Wizard through the upgrade process
- Go to Wiki Index and click on the previously created subwiki name to start the DW
The upgrade process is completed successfully without errors both on the Main wiki, as well as on subwiki.
A merge conflict is encountered, related to the page 'Panels.PanelWizard' on Main Wiki's DW as well as on subwiki's DW.
The issue was reproduced on MySQL, PostgreSQL and HSQL.