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

merge: in case of conflict fallback to previous is not working properly

    XMLWordPrintable

    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

      When doing 3-way merge of "abcd", "yycd", "azzd" the fallback on previous led to "acd" instead of "abcd".

        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: