Uploaded image for project: 'XWiki Platform'
  1. XWiki Platform
  2. XWIKI-12621

Merge conflict for XWiki.Admin when upgrading from default 7.1.2 to default 7.2

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Critical
    • Resolution: Duplicate
    • Affects Version/s: 7.2
    • Fix Version/s: None
    • Component/s: Extension
    • Labels:
      None
    • Difficulty:
      Unknown
    • Similar issues:

      Description

      I've used the default jetty/hsqldb distribution and done the following:

      • unzip 7.1.2
      • unzip 7.2 and replace the data dir from the one from 7.1.2
      • start xwiki and perform the upgrade process
      • I got a merge conflict for XWiki.Admin which shouldn't happen since I didn't modify anything. See screenshots.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              tmortagne Thomas Mortagne
              Reporter:
              vmassol Vincent Massol
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved:
                Date of First Response: