This task is preliminary, based on all the prototype feedback received until August 31st 2016. However, the request for feedback is still ongoing, hence the task is subject to change.
Create a media wiki extension that instead of showing the current edit merge screen, shows a new one when an edit conflict occurs.
The new one:
- has an info box that explains about the situation with the following text
- //Another user just edited and saved this page. There is a conflict between your version and the current version. You will have to merge your changes into the current text version. Only the text in the editor field will be saved when you click on "Publlish page".//
- has a split screen
- the left hand side shows the user’s version in wikitext, but non-editable.
- Its title is //Conflicting changes//
- The subtitle is //Differences between the currently published version (by Grashüpfer90 on Date Time) and your text (Date Time).//
- the right hand side of the split screen shows the editor with the other user’s version.
- Its title is //Editor with version to be published//
- The subtitle is //The version in the editor will be published. Initially, its contents is the currently published version (by Grashüpfer90 on Date Time)//
- //Grashüpfer90 //is the last publisher. There might have been more saves between the user's starting and finishing to edit. //Date Time// always represents the publication time.
- the windows can be scrolled independently of each other
- When people click on „publish“, the editor’s version is the one that is saved
For the general layout see [[ https://meta.wikimedia.org/wiki/File:Edit_Conflict_-_Mock_with_js_(as_of_August_2016).pdf | this mockup ]]. Please use the text as explained above, though, and ignore all features that have not been explicitely mentioned above for now.
This is part of fulfilling wish #1 of the German-speaking community wishlist 2015 (T139601).
The solution is a result of on-wiki discussion and Wikimania 2016 sessions and testings, as well as feedback we received to the prototype.