Release status: beta
|Description||Provides an alternative two-column view for the edit conflict resolution page|
|Author(s)||Wikimedia Germany (WMDE)|
|Latest version||continuous updates|
|Compatibility policy||release branches|
|License||GNU General Public License 2.0 or later|
|Translate the TwoColConflict extension if it is available at translatewiki.net|
|Check usage and version matrix.|
|Issues||Open tasks · Report a bug|
The TwoColConflict extension provides an alternative two-column view for the edit conflict resolution page. It highlights differences between the editor's and the conflicting change directly in the textfield for an easy possibility to copy and paste desired pieces of the text and resolving the conflict.
- Download and place the file(s) in a directory called
- Add the following code at the bottom of your LocalSettings.php:
wfLoadExtension( 'TwoColConflict' );
- Done – Navigate to Special:Version on your wiki to verify that the extension is successfully installed.
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 beta-features preferences page in your Wiki.
This page helps you to resolve an edit conflict.
Inside the box containing the conflicting changes, both the conflicting text and your text is shown, and the differences between the two are highlighted.
There are 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.
The second column is an editor. When the page is opened, there is a selection box on top of the editor. It lets you decide which version should be in the editor. This is often the version where more changes were made.
You can then copy and paste the desired parts of the text to the editor to edit the version that should be saved.
$wgTwoColConflictBetaFeature: (boolean, true by default) Activate this extension as a Beta Feature when Extension:BetaFeatures is activated.
$wgTwoColConflictUseInline: (boolean, true by default) Use the view with inline conflicting changes in one column and a classic wikitext form in the other column; the alternative view is a diff similar to MediaWiki built-in view, but with buttons on each conflicting line to select one or the other version.
|This extension is being used on one or more Wikimedia projects. This probably means that the extension is stable and works well enough to be used by such high-traffic websites. Look for this extension's name in Wikimedia's CommonSettings.php and InitialiseSettings.php configuration files to see where it's installed. A full list of the extensions installed on a particular wiki can be seen on the wiki's Special:Version page.|