Page MenuHomePhabricator

Better solutions to edit conflicts (#1)
Open, Needs TriagePublic

Description

Survey: 2015

Original wish (German): https://de.wikipedia.org/wiki/Wikipedia:Umfragen/Technische_W%C3%BCnsche_2015/Artikel#Bessere_L.C3.B6sung_von_Bearbeitungskonflikten
Update sites on-wiki:

Related Analytics:
https://grafana.wikimedia.org/dashboard/db/mediawiki-edit-conflicts, see also T139019

Scoping by TCB-Team:
Focus on improving the UI, not the algorithm behind.

Development Plan:
Based on the feedback we received for the prototype on de-wiki, meta and through offline conversations, we now plan to implement the following:

  • DONE: Create a two-column edit screen (T143823), where the editor is on the right hand side, the differing versions on the left hand side (T143824). In contrast to the prototype, the new screen should automatically jump to the first edit conflict appearing
  • DONE: Enable the new edit merge page as a beta feature on 1 - 3 wikipedias for the first live testing
  • DONE: Enable the new beta feature on all wikis
  • Come to a decision whether or not to deploy it "for real"

Related ideas, out of scope for the TCB-Team for now:

Interesting pages:
The current help page for solving an edit conflict

Related Objects

StatusSubtypeAssignedTask
DuplicateNone
OpenNone
OpenNone
OpenNone
ResolvedTobi_WMDE_SW
ResolvedAddshore
ResolvedTobi_WMDE_SW
ResolvedAddshore
ResolvedTobi_WMDE_SW
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
ResolvedAndrew-WMDE
DuplicateNone
ResolvedWMDE-Fisch
DuplicateNone
ResolvedAndrew-WMDE
ResolvedJan_Dittrich
InvalidLea_WMDE
ResolvedAndrew-WMDE
DuplicateNone
InvalidNone
DuplicateNone
ResolvedLena_WMDE
ResolvedAddshore
InvalidNone
ResolvedWMDE-Fisch
ResolvedNone
ResolvedJan_Dittrich
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
ResolvedAndrew-WMDE
InvalidNone
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
InvalidNone
ResolvedAndrew-WMDE
ResolvedWMDE-Fisch
DeclinedNone
ResolvedLea_WMDE
DeclinedGoranSMilovanovic
ResolvedGoranSMilovanovic
DeclinedGoranSMilovanovic
ResolvedGoranSMilovanovic
ResolvedLea_WMDE
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
InvalidHanna_Petruschat_WMDE
ResolvedAndrew-WMDE
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
ResolvedAndrew-WMDE
ResolvedAddshore
ResolvedAddshore
ResolvedWMDE-Fisch
ResolvedLea_WMDE
ResolvedAndrew-WMDE
DuplicateNone
Resolved jkroll
Resolvedthiemowmde
ResolvedWMDE-Fisch
ResolvedNone
DuplicateNone
DuplicateNone
DuplicateNone
ResolvedAndrew-WMDE
ResolvedAndrew-WMDE
ResolvedWMDE-Fisch
Resolved jkroll
ResolvedAndrew-WMDE
DuplicateNone
Resolvedthiemowmde
ResolvedWMDE-Fisch
ResolvedAndrew-WMDE
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
DeclinedNone

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

The more often I encounter TwoColumnEditConflict, the less I like it. We should look again at what problem we are solving, because I feel we are just delivering 'more ui' and about an equal understanding of the problem.

I think we need 3 way merge and some proper conflict resolution UI.

See this Atom.io UI someone made for git at some point (animated GIF)

Gitlab has also done quite some work in this area:

@Lea_WMDE: All subtasks are closed. Could this task also be closed?
It seems that potential future work should simply be tagged with Two-Column-Edit-Conflict-Merge nowadays.