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

merge: conflicts are not always reported in case of change and insert in current and next

    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

      Merging the following: "abcefhik", "abdefgijk","abcdehijk"
      currently does not produce any conflict, where it should in fact produces two conflicts:
      1. on the "c" that has been changed on "d" on one case, and kept on the other one with a "d" added
      2. on the "f" which has been removed on one case, and kept on the other one but with a "g" replacing the "h" afterwards.

        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: