Maniphest T195717

Change order of versions (from" your version, other version" to "other version, your version") (No. 3)
Closed, DuplicatePublic
Actions

Description

Motivation
Currently the version of the user in need to merge the edits is on the left. In the feedback loop it was claimed confusing as users expect their last version to be on the right.

Task

Switch the version of the user currently merging the edit conflict to the right
The colors stay the same (i.e. yellow on the left, blue on the right)

Related Objects
Search...

Status	Assigned	Task
Open	None	T72163 Edit conflicts (tracking)
Resolved	None	T139601 Better solutions to edit conflicts (#1)
Resolved	WMDE-Fisch	T195711 Make v2 of TwoColConflict: line based edit conflict handling
Duplicate	None	T195717 Change order of versions (from" your version, other version" to "other version, your version") (No. 3)

Event Timeline

Hanna_Petruschat_WMDE created this task.May 27 2018, 9:20 PM

Lea_WMDE renamed this task from Change order of versions (your version, other version) (No. 3) to Change order of versions (from" your version, other version" to "other version, your version") (No. 3).May 28 2018, 8:44 AM

Lea_WMDE updated the task description. (Show Details)

thiemowmde moved this task from Incoming to Edit Conflict Handling on the TCB-Team (now WMDE-TechWish) board.Jun 12 2018, 4:10 PM

• Vvjjkkii renamed this task from Change order of versions (from" your version, other version" to "other version, your version") (No. 3) to q6baaaaaaa.Jul 1 2018, 1:07 AM

• Vvjjkkii triaged this task as High priority.

• Vvjjkkii added projects: CheckUser, Connected-Open-Heritage-Batch-uploads (RAÄ-KMB_1_2017-02), Tamil-Sites, Gamepress, Hashtags, Jade, KartoEditor, Language-2018-Apr-June, New-Editor-Experiences, Mail.

• Vvjjkkii updated the task description. (Show Details)

• Vvjjkkii removed a subscriber: Aklapper.

CommunityTechBot renamed this task from q6baaaaaaa to Change order of versions (from" your version, other version" to "other version, your version") (No. 3).Jul 2 2018, 3:37 PM

CommunityTechBot raised the priority of this task from High to Needs Triage.

CommunityTechBot updated the task description. (Show Details)

CommunityTechBot removed projects: Mail, New-Editor-Experiences, Language-2018-Apr-June, KartoEditor, Jade, Hashtags, Gamepress, Tamil-Sites, Connected-Open-Heritage-Batch-uploads (RAÄ-KMB_1_2017-02), CheckUser.

CommunityTechBot added a subscriber: Aklapper.

Lea_WMDE closed this task as a duplicate of T198210: Display conflicting lines side by side and same lines over the whole page layout.Jul 3 2018, 7:18 AM

thiemowmde removed a project: TCB-Team (now WMDE-TechWish).Jan 7 2022, 3:23 PM