The TwoColConflict extension is a stable extension used by +2K users and already a beta feature on de-wiki, meta, mediawiki.org and finnish wp. It is time to test it on all wikis.
The TwoColConflict extension should become a beta feature on all wikis on May 9. We will then evaluate until latest the end of 2017 whether the extension should be deployed. Due to the nature of edit conflicts happening occasionally and unplanned, we expect a longer feedback time than is needed for other features.
Merging of current stories
Must-have until then (needs to be deployed outside of merge train, but ideally at the same both together):
T163783: Open help dialogue the first time a user sees TwoColConflict
T163886: Adapt help dialogue to moment of beta deploy
Should be deployed after the two tickets above, but all together:
T162148: Improve the help dialogue for users of edit conflict
T162144: Change explanatory text to account for multiple edits
T163566: Remove the "show changes" radio button selection
T162147: Allow users to choose their base version for the conflict resolution
Can be deployed whenever:
T162021: Align the column texts perfectly
TwoColConflict is the extension resulting of wish # 1 of the German-speaking Community Wishlist (T139601) in 2015. The goal is to improve the UI for resolving edit conflicts. In contrast to the current page, users now have two columns helping them to solve conflicting versions: The first one displays the changes between the version, whereas the other one is a text editor, which can be used on eye level with the changes.