N.B: This needs to be deployed latest on May 09, to be live when T162806: Make TwoColConflict a beta feature on all wikis happens.
This page helps you to resolve an edit conflict. There are two columns: The first shows the conflicting changes and the second column is a text editor, whose content will be saved.
Feedback to the page is very much appreciated here.
(here is still the same link)
The first column shows the changes in your version and the changes in the currently saved version. The differences between both versions are highlighted.
At the top of the first column you can click on “show” to see unchanged text. This might help to understand the context of changes. By default, unchanged text is greyed out and collapsed.
The second column is an editor. Copy and paste the desired parts of your version into the text in the editor. Only what is in the editor will be published, when you click the "Publish changes" button.
Please update the usage part of the manual as well:
Only for the first screen, please use the following text:
Whenever an edit conflict happens, the new page for conflict resolution will appear. It is split into two columns: The first shows the conflicting changes and the second column is a text editor, whose content will be saved.