Page MenuHomePhabricator

Add highlighting of changes in the conflict column
Closed, ResolvedPublic

Description

see mockup here https://upload.wikimedia.org/wikipedia/commons/8/84/Edit_Conflict_-_Mock_with_js_%28as_of_August_2016%29.pdf

It seems that this means getting some custom structured data from the Diff, probably by parsing it somehow.

Event Timeline

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptNov 1 2016, 5:42 PM
WMDE-Fisch moved this task from Proposed to Todo on the WMDE-QWERTY-Team board.Nov 1 2016, 5:45 PM
WMDE-Fisch moved this task from Todo to Sprint ready on the WMDE-QWERTY-Team board.

Change 322128 had a related patch set uploaded (by WMDE-Fisch):
[WIP] Add highlighting of changes.

https://gerrit.wikimedia.org/r/322128

Change 322890 had a related patch set uploaded (by Tobias Gritschacher):
Extend browsertests to test new conflict-view

https://gerrit.wikimedia.org/r/322890

Change 322128 merged by jenkins-bot:
Highlight changes in the unified diff column

https://gerrit.wikimedia.org/r/322128

Change 322890 merged by jenkins-bot:
Extend browsertests to test new conflict-view

https://gerrit.wikimedia.org/r/322890

Tobi_WMDE_SW closed this task as Resolved.Dec 1 2016, 3:23 PM
Tobi_WMDE_SW moved this task from Done to Demoed on the WMDE-QWERTY-Team board.