Details
-
Bug
-
Resolution: Solved By
-
Major
-
None
-
11.5, 11.3.2
-
None
-
Unknown
-
N/A
-
N/A
-
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
bystarted to walk
and Save&continuedressed in black
- In the second tab add
line afterdressed in black
and Save&Viewstarted to walk
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
- relates to
-
XCOMMONS-1684 Improve merge algorithm
- Open