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

Add an option to disable automatic silent merges when upgrading an extension

    XMLWordPrintable

Details

    • New Feature
    • Resolution: Fixed
    • Major
    • 9.2-rc-1
    • 7.1.2
    • Extension
    • None
    • Unknown

    Description

      Automatic silent merges are good for most of the users. There are some cases though when advanced users want to have 100% control over what happens during an upgrade. They want to be able to decide what happens on each merge conflict, even for those that can be resolved automatically.

      A use case is this: you have an extension X installed. You find a bug. You report the bug and provide a fix. You also patch your local extension. The issue is finally fixed by the extension owners but in a different way or in a different place (e.g. in a different wiki page). When you perform the upgrade you don't want to keep your local (temporary) fix. If you don't have the option to disable automatic silent merges then your local fix may be preserved, possibly conflicting with the upstream fix.

      Attachments

        Issue Links

          is duplicated by

          New Feature - A new feature of the product, which has yet to be developed. XWIKI-13190 Add a configuration to force EM to always ask when a page is modified instead of merging when possible

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

          New Feature - A new feature of the product, which has yet to be developed. XWIKI-13747 Allow resetting changes found by the "Compute change" feature of EM

          • Major - Major loss of function.
          • Closed
          relates to

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-10636 Allow the "Resolve automatically" to be applied per extension instead of globally

          • Major - Major loss of function.
          • Open

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-14116 Allow controlling the display of the Extension conflict setup question from the profile

          • Major - Major loss of function.
          • Closed

          Activity

            People

              tmortagne Thomas Mortagne
              mflorea Marius Dumitru Florea
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: