today the TwoColConflict extension (= Two Column Edit Conflict View) [1] got deployed as a beta feature to all wikis.

The Two Column Edit Conflict View is a new interface for the edit conflict resolution page. It highlights differences between the editor's and the conflicting changes to make it easier to copy and paste pieces of the text and resolve the conflict. [2] [3]  The feature aims to fulfill a request for a more user-friendly edit conflict resolution from the German-speaking community's Technical Wishlist. Therefore, the focus of the feature lays on providing a more user-friendly interface and does not aim to improve the current diff engine. The concept & implementation of the feature was widely discussed with many different users onwiki and in real life and got developed over the past months. [3]

The beta feature has already been available on deWP, meta, heWP, arWP for more than 2 months and on fiWP for a few weeks.

As much as we don't want anyone to run into an edit conflict, we'd love to receive feedback on the new interface in case you have one! The feature can be activated in the beta feature section, and the feedback link provided there will bring you to: https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View.

Thanks to everyone who gave feedback so far and helped us to further improve the feature!

Birgit (for WMDE's Technical Wishes team)

[1] https://www.mediawiki.org/wiki/Extension:TwoColConflict (extension manual for developers)
[2] https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View (Multilingual help page & central feedback page for all users)
[3] https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Edit_Conflicts (English-speaking project page with documentation of research, prototype testing and feedback loops)
[4] https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes (Technical Wishes project page)