Page MenuHomePhabricator

Make TwoColConflict a beta feature on all wikis
Closed, ResolvedPublic


The TwoColConflict extension is a stable extension used by +2K users[1] and already a beta feature on de-wiki, meta, and finnish wp. It is time to test it on all wikis.

Time plan:
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.


Event Timeline

Change 352817 had a related patch set uploaded (by Addshore; owner: Addshore):
[mediawiki/extensions/TwoColConflict@wmf/1.29.0-wmf.21] BACKPORTS from master.

Change 352817 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@wmf/1.29.0-wmf.21] BACKPORTS from master.

Mentioned in SAL (#wikimedia-operations) [2017-05-09T13:49:10Z] <hashar@tin> Synchronized php-1.29.0-wmf.21/extensions/TwoColConflict: BACKPORTS from master - T162806 T163886 (duration: 00m 41s)

Addshore moved this task from Proposed to Done on the WMDE-TechWish board.
08:35 hashar@tin: Synchronized wmf-config/InitialiseSettings.php: wmgUseTwoColConflict true for all wikis (duration: 00m 54s)