Details
-
Suggestion
-
Resolution: Unresolved
-
None
-
0
-
5
-
Description
NOTE: This suggestion is for Confluence Server. Using Confluence Cloud? See the corresponding suggestion.
When a merge conflict occurs, the user is given a screen that contains:
- An error message
- A change report
- Overwrite and Cancel buttons
- An editor.
The error message says:
You were editing an outdated version of this page. Another user has updated this page before you. Your changes against the now updated version is shown below. Please decide whether your changes should overwrite it or you wish to discard your changes.
What the user is actually expected to do if they're playing fair is:
- Look through the change report
- Merge any changes from the change report into their own submission in the editor
- Click Overwrite
Interestingly, the UI differs from the documentation so it has clearly changed at some stage in the past.
It seems that some users don't realise they can update their entry with changes from the merge report before clicking Overwrite. That doesn't seem too surprising to me given that the error message doesn't give "updating their changes" as an option let alone a suggestion.
Attachments
Issue Links
- is related to
-
CONFSERVER-11530 Overwriting changes from the editing conflict screen also abandons any additional changes made after the conflict was detected
-
- Closed
-
- relates to
-
-
- Closed
-
-
- Gathering Interest