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

Merge conflict when creating a subwiki and adding some members

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 5.3, 6.0-rc-1
    • Fix Version/s: 6.2
    • Component/s: Wiki
    • Labels:
      None
    • Difficulty:
      Unknown
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      Steps to reproduce:

      1. Create a new subwiki
      2. In step 2 add 2 members in the Members section
      3. Distribution Wizard will kick in and "XWiki Enterprise - UI - Wiki 5.3" will be recommended
      4. Click Install and then Continue

      You'll get a merge conflict for XWiki.XWikiAllGroup for the 2 members previously added in step 2. The default option is to "Keep the new version of the document" which overwrites your previous added members. You have to select "Keep the current version of the document" in order to keep your members.

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                gdelhumeau Guillaume Delhumeau
                Reporter:
                msmeria Manuel Smeria
              • Votes:
                0 Vote for this issue
                Watchers:
                3 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:
                  Date of First Response: