Page MenuHomePhabricator

Implement edit conflict resolution for MCR
Open, NormalPublic

Description

Edit conflict resolution needs to take into consideration all slots. Extra slots must not be ignored, otherwise edits may be silently overwritten.

Edit conflict resolution has two stages, which need to be considered and implemented separately:

  1. automatic conflict resolution via a 3-way-merge
  2. in case of merge conflicts, used mediated interactive resolution.

To fully satisfy this ticket, mediated interactive resolution has to work for all slots, and has to work for edits that change multiple slots at once. However, as a temporary base line, it may be acceptable to only implement automatic resolution multi-slot and non-main-slot edits, and reject the edit if automatic merging fails.

Related Objects

StatusAssignedTask
Declineddchen
OpenNone
OpenNone
DuplicateNone
OpenNone
ResolvedAbit
OpenNone
OpenNone
OpenNone
DuplicateNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
Resolvedppelberg
ResolvedKrinkle
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenAnomie
Resolveddaniel
Opendaniel
ResolvedAnomie
ResolvedAnomie
ResolvedTgr
ResolvedTgr
OpenAnomie
OpenNone
OpenNone
Opendaniel
OpenAnomie
Resolveddaniel
Resolveddaniel
InvalidTgr
ResolvedAnomie
ResolvedAnomie
OpenNone

Event Timeline

daniel triaged this task as Normal priority.May 15 2018, 10:16 AM
daniel created this task.

I just realized that this ticket is moot as long as EditPage can only edit the main slot. As long as this is the case, conflicts can only affect the main slot, and merging the main slot is sufficient. So this is really part of the T174033: Refactor EditPage to allow multiple slots to be edited atomically [MCR] epic.

Anomie added a subscriber: Anomie.Jun 20 2018, 12:37 PM

I just realized that this ticket is moot as long as EditPage can only edit the main slot.

ApiEditPage too.

I'd say both upating EditPage for editing multiple slots and updating ApiEditPage for editing multiple slots are blocked on someone implementing what we've been calling EditController, part of which is this task. But ApiEditPage isn't also potentially blocked on UI issues.

Vvjjkkii renamed this task from Implement edit conflict resolution for MCR to 1xcaaaaaaa.Jul 1 2018, 1:10 AM
Vvjjkkii raised the priority of this task from Normal to High.
Vvjjkkii updated the task description. (Show Details)
Vvjjkkii removed a subscriber: Aklapper.
CommunityTechBot renamed this task from 1xcaaaaaaa to Implement edit conflict resolution for MCR.Jul 2 2018, 5:20 AM
CommunityTechBot lowered the priority of this task from High to Normal.
CommunityTechBot updated the task description. (Show Details)
CommunityTechBot added a subscriber: Aklapper.
WDoranWMF moved this task from MCR to mop on the Core Platform Team board.Fri, Jul 26, 6:40 PM