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

    • 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 doing 3-way merge of "abcd", "yycd", "azzd" the fallback on previous led to "acd" instead of "abcd".

      Attachments

        Issue Links

          depends on

          Bug - A problem which impairs or prevents the functions of the product. XCOMMONS-1692 merge: no way to fallback on another value than current if current is empty

          • Major - Major loss of function.
          • Closed
          relates to

          Bug - A problem which impairs or prevents the functions of the product. XCOMMONS-1700 merge: conflict reporting might be wrong in case of multiple conflicts and fallback config

          • 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: