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

    • Unknown

    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

          blocks

          New Feature - A new feature of the product, which has yet to be developed. XWIKI-7649 Introduce document merge conflict resolution UI

          • Major - Major loss of function.
          • Closed
          is related to

          New Feature - A new feature of the product, which has yet to be developed. XWIKI-7652 Provide a set of script oriented APIs to manage Document diffs

          • Major - Major loss of function.
          • Open

          Activity

            People

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

              Dates

                Created:
                Updated:
                Resolved: