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

Two overlapping changes are not merged correctly

    Details

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

      Description

      A 3-way merge between: "aabbcc","ddddcc","arrbcc" fallbacks on "ddddcc"
      A 3-way merge between: "abcd","azzd","yycd" fallbacks on "yycd"

      However a 3-way merge between: "aabbcc abcd", "ddddcc azzd" and "arrbcc yycd" currently produces
      "ddddcc azzdyy". I think the "yy" suffix is wrong here.

      Expected result: "dddcc yycd"

        Attachments

          Issue Links

            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: