Help:Paragraph-based Edit Conflict Interface/en

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

 * 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 beta-features preferences page.
 * Whenever an edit conflict happens, the new two-column view for conflict resolution will appear.
 * You will see a box with the conflicting changes in one column and an editor with the currently saved version of the text in another column.
 * Inside the box containing the conflicting changes, both the conflicting text and your text is shown, and the differences between the two are highlighted.
 * When javascript is enabled, you can use buttons above the box which allow you to hide any unchanged parts of the text to make it easier to focus on the conflicting areas.
 * You can then copy and paste the desired parts of the text to the editor to adjust the version that should be saved.
 * Once you hit the "Save changes" button, the version from the editor will be saved.

Deployment roadmap
As a beta feature:
 * Mediawiki.org: February 6, 2017 ✅
 * Meta: February 13, 2017
 * Dewiki: February 14, 2017
 * Other wikis: TBD/TBA