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

merge: Conflicts decision are not properly applied in case of insertion

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: 11.7-rc-1
    • Fix Version/s: 11.8-rc-1
    • Component/s: Diff
    • Labels:
      None
    • Tests:
      Unit
    • Difficulty:
      Unknown
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      In case of insertion of two conflicting values, applying the "previous" decision should only prevent the value to be inserted in current or next, and shouldn't impact the commons elements.

        Attachments

          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: