• Type: Bug
• Resolution: Fixed
• Priority: High
• Fix Version/s: 5.2.2, 5.2.3, 5.3-OD-4-1
• Affects Version/s: 5.1, 5.1.2, 5.1.3, 5.1-OD-6, 5.2-OD-5
• Component/s: None
• Labels:

  • affects-cloud
  • affects-server
  • ed-bl
  • editor
  • merging
  • ondemand
  • team-editor
  • warranty

1. A.png

   22/Apr/2013 8:05 PM

   27 kB

   Jeison

2. B.png

   22/Apr/2013 8:05 PM

   27 kB

   Jeison

3. C.png

   22/Apr/2013 8:05 PM

   18 kB

   Jeison

4. D.png

   22/Apr/2013 8:05 PM

   16 kB

   Jeison

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

Katherine Yabut made changes - 13/Nov/2018 4:45 AM

Workflow

Original: JAC Bug Workflow v3 [ 2899424 ]

New: CONFSERVER Bug Workflow v4 [ 2993994 ]

Owen made changes - 11/Oct/2018 9:06 AM

Workflow	Original: JAC Bug Workflow v2 [ 2793577 ]	New: JAC Bug Workflow v3 [ 2899424 ]
Status	Original: Resolved [ 5 ]	New: Closed [ 6 ]

Owen made changes - 29/Aug/2018 11:17 PM

Workflow

Original: JAC Bug Workflow [ 2723352 ]

New: JAC Bug Workflow v2 [ 2793577 ]

Owen made changes - 02/Jul/2018 7:00 AM

Workflow

Original: Confluence Workflow - Public Facing - Restricted v5 - TEMP [ 2400794 ]

New: JAC Bug Workflow [ 2723352 ]

Katherine Yabut made changes - 22/Jun/2017 6:53 AM

Workflow

Original: Confluence Workflow - Public Facing - Restricted v5 [ 2300521 ]

New: Confluence Workflow - Public Facing - Restricted v5 - TEMP [ 2400794 ]

Katherine Yabut made changes - 31/May/2017 5:40 AM

Workflow

Original: Confluence Workflow - Public Facing - Restricted v5.1 - TEMP [ 2234588 ]

New: Confluence Workflow - Public Facing - Restricted v5 [ 2300521 ]

Katherine Yabut made changes - 31/May/2017 5:01 AM

Workflow

Original: Confluence Workflow - Public Facing - Restricted v5 - TEMP [ 2197175 ]

New: Confluence Workflow - Public Facing - Restricted v5.1 - TEMP [ 2234588 ]

Katherine Yabut made changes - 31/May/2017 2:06 AM

Workflow

Original: Confluence Workflow - Public Facing - Restricted v5 [ 1932223 ]

New: Confluence Workflow - Public Facing - Restricted v5 - TEMP [ 2197175 ]

Katherine Yabut made changes - 03/Apr/2017 3:59 AM

Workflow

Original: Confluence Workflow - Public Facing - Restricted v3 [ 1732533 ]

New: Confluence Workflow - Public Facing - Restricted v5 [ 1932223 ]

jonah (Inactive) made changes - 02/Apr/2017 8:18 AM

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.

Load more older events