Page MenuHomePhabricator

Show text changes of both parties in edit conflict text field
Closed, ResolvedPublic18 Estimated Story Points


The text field on the left hand side of the new edit merge screen (see T143823) should be changed as follows:
Show Diff View

  • The textfield shows the diff of both versions
  • The diff algorithm is exactly the same as it is currently implemented. The only difference is that it is not displayed side-by-side but above each other
  • Both changes are introduced by a header:
    • Header texts: Your change and Currently published
    • These headers cannot be copied. Everything else can.

Include not changed text

  • All text that has stayed the same in both versions is printed in the textfield as well. The diff parts always appear at their appropriate position in the text.


  • The changes introduced by the user, the headline for the user's changes and the "you" of the subtitle all have the same background color. The color should be the same that is used now in the diff view.
  • The changes of the published version, its headline and the "currently published version" of the subtitle all have the same background color, too. The color should also be the same that is used now in the diff view.
  • The "currently published version" of the subtitle of "Editor to be published" should also get the same color background

All of this would ideally be implemented without the use of javascript.

See also the mock for a general idea.

This is part of fulfilling wish #1 of the German-speaking community wishlist 2015 (T139601).
The solution is a result of on-wiki discussion and Wikimania 2016 sessions and testings, as well as feedback we received to the prototype.

Event Timeline

Lea_WMDE set the point value for this task to 18.
Tobi_WMDE_SW claimed this task.