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

Unexpected merge behaviour in case of conflict

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Solved By
    • Affects Version/s: 11.5, 11.3.2
    • Fix Version/s: 11.7-rc-1, 11.3.3
    • Component/s: Old Core
    • Labels:
      None
    • Difficulty:
      Unknown
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      Reproduction steps:

      • Create a new document with the following lines:

        Once upon a time
        a wolf
        started to walk
        in the forest

      • Save&View
      • Open the page in edit in two tabs and ensure the editor is loaded in both tabs
      • In the first tab replace

        started to walk

        by

        dressed in black

        and Save&continue
      • In the second tab add

        dressed in black

        line after

        started to walk

        and Save&View

      Expected behaviour:

      • A conflict is detected

      Obtained behaviour:

      • The page is saved with a merge and its content is:

        Once upon a time
        a wolf
        dressed in black
        dressed in black
        in the forest

        Attachments

          Issue Links

            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: