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

3 ways merge with new version empty always end up empty by default

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Major
    • 6.1, 5.4.6
    • 6.1-rc-1
    • Diff
    • None
    • Unit
    • N/A
    • N/A

    Description

      How to reproduce:

      • previous: "a"
      • current: "b"
      • next: ""

      This gives a conflict of course but the proposed merge is "" which is wrong since priority is supposed to go to current version so the result should ideally be "b".

      Attachments

        Activity

          People

            tmortagne Thomas Mortagne
            tmortagne Thomas Mortagne
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: