Wiki source code of [AUTOMATED] Warning conflict when editing a page [Since XWiki 11.5RC1]
Last modified by Ilie Andriuta on 2026/10/22 13:33
Show last authors
| author | version | line-number | content |
|---|---|---|---|
| 1 | **NOTE**: Realtime WYSIWYG should not be activated. To deactivate it, go to Administer Wiki > Editing > WYSIWYG Editor > Disabled Plugins drop-down and add (tick) "xwiki-realtime" in the list then Save. | ||
| 2 | |||
| 3 | 1. Login as Admin and create an user (e.g. U1) | ||
| 4 | 1. Edit a page (insert e.g. 'edit1') | ||
| 5 | 1. Click 'Save' | ||
| 6 | 1. Open a different browser (or an incognito window) and login with the user (U1) | ||
| 7 | 1. Go to the same page and (force) edit it | ||
| 8 | 1. Add some text e.g. 'edit2' on the same line | ||
| 9 | 1. Click 'Save' | ||
| 10 | 1. Go to the browser where Admin is logged in and type a word (e.g. 'edit3') | ||
| 11 | 1. Click 'Save' | ||
| 12 | 1. Select 'Merge and fix conflicts with your changes' and click 'Save' | ||
| 13 | 1. Repeat steps 2-9 | ||
| 14 | 1. Select 'Force save your changes' and click 'Save' | ||
| 15 | 1. Repeat steps 2-9 | ||
| 16 | 1. Select 'Reload the editor' and click 'Save' | ||
| 17 | 1. Repeat steps 2-9 | ||
| 18 | 1. Select 'Fix each conflict individually' | ||
| 19 | 1. On the bottom, select each option: 'your current changes', 'before your changes', 'latest version saved', 'custom version' | ||
| 20 | 1. Pick an option and click 'Save' |
