Uploaded image for project: 'Confluence Data Center'
  1. Confluence Data Center
  2. CONFSERVER-29048

Confluence fails to non-conflicting merge changes while editing page concurrently

      NOTE: This bug report is for Confluence Server. Using Confluence Cloud? See the corresponding bug report.

      As per the documentation, Confluence should be able to merge non-conflicting changes successfully when two users are editing a page at the same time, but this doesn't seem to be happening.

      Steps to reproduce:
      1- User 1 opens page for editing, and enters text in one section:

      2- User 2 opens page for editing, and enters text in another section:

      3- User 1 saves changes, and gets the resulting page:

      4- User 2 saves changes, and gets the resulting page:

      The changes made by User 1 were lost, even though they were not conflicting. No errors are shown during the process.

        1. A.png
          A.png
          27 kB
        2. B.png
          B.png
          27 kB
        3. C.png
          C.png
          18 kB
        4. D.png
          D.png
          16 kB

            [CONFSERVER-29048] Confluence fails to non-conflicting merge changes while editing page concurrently

            Katherine Yabut made changes -
            Workflow Original: JAC Bug Workflow v3 [ 2899424 ] New: CONFSERVER Bug Workflow v4 [ 2993994 ]
            Owen made changes -
            Workflow Original: JAC Bug Workflow v2 [ 2793577 ] New: JAC Bug Workflow v3 [ 2899424 ]
            Status Original: Resolved [ 5 ] New: Closed [ 6 ]
            Owen made changes -
            Workflow Original: JAC Bug Workflow [ 2723352 ] New: JAC Bug Workflow v2 [ 2793577 ]
            Owen made changes -
            Workflow Original: Confluence Workflow - Public Facing - Restricted v5 - TEMP [ 2400794 ] New: JAC Bug Workflow [ 2723352 ]
            Katherine Yabut made changes -
            Workflow Original: Confluence Workflow - Public Facing - Restricted v5 [ 2300521 ] New: Confluence Workflow - Public Facing - Restricted v5 - TEMP [ 2400794 ]
            Katherine Yabut made changes -
            Workflow Original: Confluence Workflow - Public Facing - Restricted v5.1 - TEMP [ 2234588 ] New: Confluence Workflow - Public Facing - Restricted v5 [ 2300521 ]
            Katherine Yabut made changes -
            Workflow Original: Confluence Workflow - Public Facing - Restricted v5 - TEMP [ 2197175 ] New: Confluence Workflow - Public Facing - Restricted v5.1 - TEMP [ 2234588 ]
            Katherine Yabut made changes -
            Workflow Original: Confluence Workflow - Public Facing - Restricted v5 [ 1932223 ] New: Confluence Workflow - Public Facing - Restricted v5 - TEMP [ 2197175 ]
            Katherine Yabut made changes -
            Workflow Original: Confluence Workflow - Public Facing - Restricted v3 [ 1732533 ] New: Confluence Workflow - Public Facing - Restricted v5 [ 1932223 ]
            jonah (Inactive) made changes -
            Description Original: As per the [documentation|https://confluence.atlassian.com/display/AOD/Concurrent+Editing+and+Merging+Changes], Confluence should be able to merge non-conflicting changes successfully when two users are editing a page at the same time, but this doesn't seem to be happening.

            Steps to reproduce:
            *1- User 1 opens page for editing, and enters text in one section:*
            !A.png!

            *2- User 2 opens page for editing, and enters text in another section:*
            !B.png!

            *3- User 1 saves changes, and gets the resulting page:*
            !C.png!

            *4- User 2 saves changes, and gets the resulting page:*
            !D.png!

            The changes made by User 1 were lost, even though they were not conflicting. No errors are shown during the process.

            New: {panel:bgColor=#e7f4fa}
              *NOTE:* This bug report is for *Confluence Server*. Using *Confluence Cloud*? [See the corresponding bug report|http://jira.atlassian.com/browse/CONFCLOUD-29048].
              {panel}

            As per the [documentation|https://confluence.atlassian.com/display/AOD/Concurrent+Editing+and+Merging+Changes], Confluence should be able to merge non-conflicting changes successfully when two users are editing a page at the same time, but this doesn't seem to be happening.

            Steps to reproduce:
            *1- User 1 opens page for editing, and enters text in one section:*
            !A.png!

            *2- User 2 opens page for editing, and enters text in another section:*
            !B.png!

            *3- User 1 saves changes, and gets the resulting page:*
            !C.png!

            *4- User 2 saves changes, and gets the resulting page:*
            !D.png!

            The changes made by User 1 were lost, even though they were not conflicting. No errors are shown during the process.

              don.willis@atlassian.com Don Willis
              jspaniol Jeison
              Affected customers:
              44 This affects my team
              Watchers:
              60 Start watching this issue

                Created:
                Updated:
                Resolved:

                  Estimated:
                  Original Estimate - 16h
                  16h
                  Remaining:
                  Remaining Estimate - 16h
                  16h
                  Logged:
                  Time Spent - Not Specified
                  Not Specified