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

ConflictType.MERGE_SUCCESS should be based on whether or not there is a difference between previous and current

    XMLWordPrintable

Details

    • Unit
    • Unknown
    • N/A
    • N/A

    Description

      Right now the criteria is "does the merge have any impact on current or an error" (considering that was the dangerous thing) but this is missing the following use cases:

      • being warned when there is a customization even when there is nothing new
      • not being warned when there was no customization (it was not really needed to merge anything in theory) since there is no risk

      Attachments

        Issue Links

          depends on

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-16572 The distribution wizard sometimes asks for a conflict resolution while no change gets displayed between previous and current versions

          • Major - Major loss of function.
          • Open

          Activity

            People

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

              Dates

                Created:
                Updated:
                Resolved: