IMPORTANT: This is the version of the help dialogue as it should look like once all stories happened. This ticket is based on the assumption that T163886: Adapt help dialogue to moment of beta deploy already happened.
Below is a decription of all screens of the helptext of the two-col-conflict extension. Please keep the ordering of image/text above each other as is.
All images can be found here
For a better understanding of the image:text relationship, I put the LTR images here as well.
Text: stays the same
Text:stays the same
stays the same
The second column is an editor. When the page is opened, there is a selection box on top of the editor. It lets you decide which version should be in the editor. This is often the version where more changes were made.
Copy and paste the desired parts of the other 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:
Use the same images and text.
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.