XWiki Commons
  1. XWiki Commons
  2. XCOMMONS-484

Silent conflict merge when diff between previous/next is not at the exact same indices than in previous/current diff

    Details

    • Type: Bug Bug
    • Status: Closed Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 5.2
    • Fix Version/s: 5.2.1, 5.3-milestone-2
    • Component/s: Diff
    • Labels:
      None
    • Tests:
      Unit
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      For example:

      • previous: abcd
      • next: yycd
      • current: azzd

        Issue Links

          Activity

          There are no comments yet on this issue.

            People

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

              Dates

              • Created:
                Updated:
                Resolved: