Uploaded image for project: '{RETIRED} XWiki Enterprise'
  1. {RETIRED} XWiki Enterprise
  2. XE-1499

Conflict on Admin user when upgrading from 6.4.4 to 7.1.1

    XMLWordPrintable

    Details

    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      I got 2 merge conflicts for these pages when doing an upgrade from 6.4.4 to 7.1.1 on Oracle 11.2:

      • XWiki.Admin
      • Mail.MailConfig

      This happened for the main wiki, but also for each subwiki that I upgraded.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              tmortagne Thomas Mortagne
              Reporter:
              msmeria Manuel Smeria
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved:
                Date of First Response: