Help:Paragraph-based Edit Conflict Interface



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 change directly in the text field for an easy possibility to copy and paste desired pieces of the text and resolving the conflict.

It will be provided as a beta feature from February/March 2017 on.

Background
The Two Column Edit Conflict View aims to fulfil a wish from the German-speaking community's technical wishlist and is developed by WMDE's Tech team. More informations can be found on the main project page on Meta.

Usage
 Enabling the new view: 

To enable the new view for edit conflict resolution, you have to be logged in and tick the checkbox for the Two Column Edit Conflict feature on the special>Special:Preferences#mw-prefsection-betafeatures|beta-features preferences page.

Deployment roadmap
As a beta feature:
 * Mediawiki.org: 2017-02-06 ✅
 * Meta: 2017-02-13
 * Dewiki: 2017-02-14
 * Other wikis: TBD/TBA