Issue tracker: #Two-Column-Edit-Conflict-Merge

Help:Paragraph-based Edit Conflict Interface/ast

From Linux Web Expert

File:PD-icon.svg Note: When you edit this page, you agree to release your contribution under the CC0. See Public Domain Help Pages for more info. File:PD-icon.svg
The first beta feature was replaced with a new interface on November 8, 2018.
File:New design for the Two Column edit conflict interface, status October 2018.png

La Vista de conflictos d'ediciones en dos columnes ye una nueva interfaz pa la páxina de resolvimientu de conflictos d'ediciones. Destaca les diferencies ente la versión del editor ya'l cambiu col que ta en conflictu direutamente nel campu de testu pa facilitar el procesu de copiar y pegar les partes deseaes del testu ya iguar el conflictu. There is an additional interface specifically designed for solving edit conflicts on talk pages.


Antecedentes

La Vista de conflictos d'ediciones en dos columnes aspira a cumplir un deséu espresáu pola comunidá de falantes d'alemán na so llista de deseos técnicos y foi desenvuelta pol equipu técnicu de WMDE. Puedes atopar más información na páxina principal del proyectu en Meta.

Usu

Activar la vista nueva: P'activar la nueva vista pal resolvimientu de conflictos d'edición, tienes que tener una sesión activa y marcar la caxella correspondiente na páxina de preferencies de funciones beta.

In a nutshell

The edit conflict interface wants to help you merge your text with the one that’s currently online. It breaks down the differences between the two text versions visually:

  • Text passages that differ are displayed in pairs next to each other: The current version of the page is shown in yellow and your version in blue. Inside, text that was changed is highlighted.
  • Text passages that are identical in both versions are displayed as a grey bar, spanning the whole width.

How to solve an edit conflict

  1. For each pair of text, select the version you want to keep.
  2. Edit the selected text, if needed.
  3. Click Publish changes. A new page version is created, combining all of the text you selected and the grey boxes.

Step by step

1. Get oriented.

A tutorial guides you through the interface the first time you encounter an edit conflict. You can open it again by clicking on the help icon (?).

In order to help you solve the edit conflict, the interface breaks down the differences between the two revisions like this:

  • Text passages that differ are displayed in pairs next to each other: The current version of the page is shown in yellow and your version in blue. Inside, text that was changed is highlighted.
  • Text passages that are identical in both versions are displayed as a grey bar, spanning the whole width.
  • If you want to copy your version (the entire article text with your edits) of the article page, click on the 'copy full text' link next to the blue marked 'Your revision' headline on the top of the interface.

2. Build a new version by merging your text with the one that’s currently online.

File:Two col conflict selected text passage.png
Selected text box, with a black pencil to start the editing mode
File:Two col conflict selected text passage in editing mode.png
Text box in editing mode, with checkmark and "X"
  • Select the passages you want to keep by clicking on the radio buttons next to them. By default, all texts from the other person are selected, so if you publish immediately, none of your text changes are saved.
  • Edit passages, if needed.
    • Click on the black pencil to open the editing mode for a text passage. If the pencil is grey, it means you need to select the text passage first. Otherwise, this version won’t be saved when you click publish.
    • You can also edit text passages that are identical in both versions.
    • The highlights that indicate the differences between the versions disappear when you edit a text passage.
    • You can integrate parts from other text passages by copy and paste, either with the copy and paste function on your keyboard or with a right click.
    • Click on the check mark to apply changes to a text box and to close its editing mode.
    • If you want to discard your changes and reset the contents of the text box to what it was when the edit conflict occurred, click on the "X". This also restores the highlighting.

3. Publish a new page version.

When you’re done selecting and editing all of the passages, click “Publish changes”. This composes all of the text passages you selected and the grey boxes into a new page revision. As on all wiki pages, you can preview the changes first via the Preview button. On clicking Cancel, you return to the current version of the page.

Non-JS version

If you’re not using JavaScript, the look or behavior of the feature will be as follows:

  • All text passages are shown in editor boxes.
  • There are no buttons within the editor boxes.
  • Text passages that are identical in both versions are always expanded.

Plan d'espardimientu

Como carauterística beta:

New beta feature:

  • The switch from the first to the new beta feature on all wikis:

2018-11-08 File:OOjs UI icon check-constructive.svg <translate> Done</translate>

Default feature on:

Ayuda cola traducción

Los mensaxes de software pa esta función pueden traducise en translatewiki. ¡Cualquier ayuda agradezse abondo!

Retrieved from "https://www.linuxwebexpert.com/wiki/index.php?title=Help:Paragraph-based_Edit_Conflict_Interface/ast&oldid=24228"