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

Two overlapping changes are not merged correctly

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Major
    • 11.7-rc-1, 11.3.3, 10.11.10
    • 10.11.9
    • Diff
    • None
    • Unit
    • Unknown
    • N/A
    • N/A

    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

          depends on

          Bug - A problem which impairs or prevents the functions of the product. XCOMMONS-1691 Next is always chosen when previous->next diff starts before previous->current

          • Critical - Crashes, loss of data, severe memory leak.
          • Closed

          Activity

            People

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

              Dates

                Created:
                Updated:
                Resolved: