Page MenuHomePhabricator

Make v2 of TwoColConflict: line based edit conflict handling
Open, NormalPublic

Description

Motivation
The current TwoColConflict beta feature works better than the current page most of the time, but there is still room for improvement. So we came up with a new idea, and the feedback we received on the prototype (T180972) was great. Now it is time to effectively change TwoColConflict.

Mock that indicates the changes compared to the prototype version: (Click this thumbnail to see the actual image)

Related Objects

StatusAssignedTask
DuplicateNone
Opencscott
OpenNone
OpenNone
OpenNone
Resolved Lea_WMDE
ResolvedAndrew-WMDE
DuplicateNone
Resolvedjkroll
Resolvedthiemowmde
ResolvedWMDE-Fisch
ResolvedNone
DuplicateNone
DuplicateNone
DuplicateNone
ResolvedAndrew-WMDE
OpenNone
ResolvedAndrew-WMDE
ResolvedWMDE-Fisch
Resolvedjkroll
ResolvedAndrew-WMDE
DuplicateNone
Resolvedthiemowmde
ResolvedWMDE-Fisch
ResolvedAndrew-WMDE
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
ResolvedWMDE-Fisch
DeclinedNone
OpenNone

Event Timeline

Restricted Application added projects: TCB-Team, Design. · View Herald TranscriptMay 27 2018, 9:02 PM
Restricted Application added a subscriber: Aklapper. · View Herald Transcript
Lea_WMDE renamed this task from Paragraph based edit conflict merge rework after prototype to Make v2 of TwoColConflict: "paragraph" based edit conflict handling.Jun 26 2018, 11:13 AM
Lea_WMDE triaged this task as Normal priority.
Lea_WMDE updated the task description. (Show Details)
Vvjjkkii renamed this task from Make v2 of TwoColConflict: "paragraph" based edit conflict handling to w6baaaaaaa.Jul 1 2018, 1:07 AM
Vvjjkkii raised the priority of this task from Normal to High.
Vvjjkkii changed the status of subtask T195716: Change wording in the description of the coloumns (No. 3) from Stalled to Open.
Vvjjkkii updated the task description. (Show Details)
Vvjjkkii changed the status of subtask T195712: Add message text for feedback (No. 1) from Stalled to Open.
Vvjjkkii changed the status of subtask T195722: Tooltip for unselected paragraphs (No. 7) from Stalled to Open.
Vvjjkkii removed a subscriber: Aklapper.
CommunityTechBot renamed this task from w6baaaaaaa to Make v2 of TwoColConflict: "paragraph" based edit conflict handling.Jul 2 2018, 3:36 PM
CommunityTechBot lowered the priority of this task from High to Normal.
CommunityTechBot changed the status of subtask T195722: Tooltip for unselected paragraphs (No. 7) from Open to Stalled.
CommunityTechBot changed the status of subtask T195712: Add message text for feedback (No. 1) from Open to Stalled.
CommunityTechBot updated the task description. (Show Details)
CommunityTechBot added a subscriber: Aklapper.
Lea_WMDE renamed this task from Make v2 of TwoColConflict: "paragraph" based edit conflict handling to Make v2 of TwoColConflict: line based edit conflict handling.Jul 4 2018, 7:52 AM
Quiddity updated the task description. (Show Details)Jul 19 2018, 1:43 PM
Lea_WMDE changed the status of subtask T195712: Add message text for feedback (No. 1) from Stalled to Open.Jul 31 2018, 11:48 AM