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

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 9.11.7
    • Fix Version/s: 9.11.8, 10.8.1, 10.9
    • Component/s: Extension - XAR
    • Labels:
      None
    • Tests:
      Unit
    • Difficulty:
      Unknown
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      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

          Activity

            People

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

              Dates

              • Created:
                Updated:
                Resolved: