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

merge: conflict reporting might be wrong in case of multiple conflicts and fallback config

    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

      When merging: "aabbcc abcd", "ddddcc azzd" and "arrbcc yycd", the conflict report is currently not the same depending on the fallback configuration.

      Attachments

        Issue Links

          is related to

          Bug - A problem which impairs or prevents the functions of the product. XCOMMONS-1699 merge: in case of conflict fallback to previous is not working properly

          • Major - Major loss of function.
          • 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: