Uploaded image for project: 'XWiki Platform'
  1. XWiki Platform
  2. XWIKI-23441

Merge fallback of xobjects is badly handled

    XMLWordPrintable

Details

    • Unit
    • Unknown
    • N/A
    • N/A

    Description

      When the next version is chosen for merging an xobject that has been deleted in current version, the merge result should contain a conflict and the new xobject. Right now the merge result doesn't contain any object and no conflict is recorded.
      See CRAPP-395 for a real life usecase.

      Attachments

        Issue Links

          Activity

            People

              surli Simon Urli
              surli Simon Urli
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: