Merge conflict resolution UI fails when there is no previous version

Similar issues:

XWIKI-9098	Merge conflict on home page title when upgrading a clean workspace
~~XWIKI-7862~~	Display all document changes in the merge conflic resolution UI
~~XWIKI-7649~~	Introduce document merge conflict resolution UI
~~XWIKI-7914~~	Installing XAR extension on existing document which is not part of the previous version does not go trough conflict resolution UI
~~XWIKI-8470~~	Merge issue in BaseObject#merge when merging a property which does not have a previous version
XWIKI-8461	XWikiPreferences properties are not merged by the distribution wizard when previous version does not have properly installed extensions
~~XWIKI-8687~~	Allow the user to specify the previously installed UI when upgrading from very old versions
~~XWIKI-8041~~	Indicate what is going to be the author of the saved document when conflict is found in a XAR extension
~~XWIKI-7647~~	Use new Job question/answer system to ask user to resolve merge conflicts in installed XARs
~~XWIKI-8180~~	Installing enterprise UI on an empty database reports merge conflicts with mandatory classes that are created automatically

This can happen when you install a XAR extension for the first time and some of its pages are already present.

depends on

XWIKI-7914 Installing XAR extension on existing document which is not part of the previous version does not go trough conflict resolution UI

There are no comments yet on this issue.

Vote (0)

Watch (1)