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

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 6.1-rc-1
    • Fix Version/s: 6.1, 5.4.6
    • Component/s: Diff
    • Labels:
      None
    • Tests:
      Unit
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      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

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

              Dates

              • Created:
                Updated:
                Resolved: