Extension:TwoColConflict

From MediaWiki.org
Jump to: navigation, search

Other languages:
Deutsch • ‎English • ‎עברית • ‎日本語 • ‎polski
MediaWiki extensions manualManual:Extensions
Crystal Clear action run.png
Extension:TwoColConflict

Release status:Extension status beta

TwoColConflict English with filter.png
ImplementationTemplate:Extension#type User interface
DescriptionTemplate:Extension#description Provides an alternative two-column view for the edit conflict resolution page
Author(s)Template:Extension#username Wikimedia Germany (WMDE)
Latest versionTemplate:Extension#version continuous updates
MediaWikiTemplate:Extension#mediawiki 1.27+
Database changesTemplate:Extension#needs-updatephp No
LicenseTemplate:Extension#license GNU General Public License 2.0 or later
Download

Translate the TwoColConflict extension if it is available at translatewiki.net

Check usage and version matrix.

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.

Installation[edit]

  • Download and place the file(s) in a directory called TwoColConflict in your extensions/ folder.
  • Add the following code at the bottom of your LocalSettings.php:
    wfLoadExtension( 'TwoColConflict' );
    
  • YesY Done - Navigate to Special:Version on your wiki to verify that the extension is successfully installed.

Usage[edit]

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.

Extension-2ColConfl-Screenshot-help-1-layout.png

After enabled, 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.

Extension-2ColConfl-Screenshot-help-2-diffMineYours.png

Inside the box containing the conflicting changes, both the conflicting text and your text is shown, and the differences between the two are highlighted.

Extension-2ColConfl-Screenshot-help-3-filters.png

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. Also you have the possibility to only show your version of the text.

Extension-2ColConfl-Screenshot-help-4-layout.png

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.

Links[edit]