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

Use new Job question/answer system to ask user to resolve merge conflicts in installed XARs

    XMLWordPrintable

    Details

    • Type: Improvement
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 4.0-milestone-1
    • Fix Version/s: 4.0-milestone-2
    • Component/s: Extension
    • Labels:
    • Difficulty:
      Unknown
    • Similar issues:

      Description

      Basically the XAR handler try to do a 3 ways merge and ask the user if it find conflicts.

      • expose the difference possible version and ask for the version to use
      • provide complete script oriented document diff tools the 4 possible versions with each others

      The UI is done on XWIKI-7649.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              tmortagne Thomas Mortagne
              Reporter:
              tmortagne Thomas Mortagne
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: