Uploaded image for project: 'XWiki Commons'
  1. XWiki Commons
  2. XCOMMONS-1732

merge: wrong management of insertion conflicts

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: 10.11.9, 11.7-rc-1, 11.3.4
    • Fix Version/s: 11.8-rc-1, 11.3.5, 10.11.10
    • Component/s: Diff
    • Labels:
      None
    • Tests:
      Unit
    • Difficulty:
      Unknown
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      When merging the following values: abc, aibc, ajbc
      A conflict is properly detected, but the fallback should be one of the versions aibc or ajbc. It shouldn't be a mix of them.

        Attachments

          Activity

            People

            • Assignee:
              surli Simon Urli
              Reporter:
              surli Simon Urli
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: