Better solutions to edit conflicts (#1)
Closed, ResolvedPublic
Actions

Assigned To

None

Authored By

	• Lea_WMDE
	Jul 7 2016, 12:55 PM

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:

T138502: Make Echo notifications for users who caused edit conflicts

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

Related Objects
Search...

Status	Assigned	Task
Open	None	T72163 Edit conflicts (tracking)
Resolved	None	T139601 Better solutions to edit conflicts (#1)
Resolved	Tobi_WMDE_SW	T143823 Create a MediaWiki extension for side-by-side edit merge screen
Resolved	Addshore	T145410 Request Repository for media wiki extension for side-by-side edit merge screen
Resolved	Tobi_WMDE_SW	T145411 Create boilerplate extension for media wiki extension for side-by-side edit merge screen
Resolved	Addshore	T146977 Rename extension from 2coldiff to TwoColDiff
Resolved	Tobi_WMDE_SW	T143824 Show text changes of both parties in edit conflict text field
Resolved	WMDE-Fisch	T151332 Make header texts in diff view non-copyable
Resolved	WMDE-Fisch	T149720 Add highlighting of changes in the conflict column
Resolved	Andrew-WMDE	T143825 Show/hide diff parts of edit merge screen
Duplicate	None	T143826 Not changed text should be collapsible
Resolved	WMDE-Fisch	T144608 Scroll textfield and editor to the first edit conflict
Duplicate	None	T144609 Show info about last version on edit merge screen
Resolved	Andrew-WMDE	T144610 Make edit merge screen responsive
Resolved	Jan_Dittrich	T144611 Investigate edit conflict behavior on mobile
Invalid	• Lea_WMDE	T144612 Open questions for edit conflict
Resolved	Andrew-WMDE	T159249 Add link with call for feedback to help dialog
Duplicate	None	T159251 Count the number of resolved edit conflicts
Invalid	None	T158165 Save and reuse filter settings from last solved conflict
Duplicate	None	T158083 Allow ignoring the conflict
Resolved	Lena_WMDE	T158073 Metrics: TwoColumnEditConflictMerge
Resolved	Addshore	T158754 Track how often an edit conflict happens for users that have TwoColConflict enabled
Invalid	None	T160424 AB-Test Filters?
Resolved	WMDE-Fisch	T156250 Create help dialog for TwoColConflict
Resolved	None	T156249 Create screenshots for TwoColConflict tutorial
Resolved	Jan_Dittrich	T156142 Help Button for TwoColConflict: Position and Look
Resolved	WMDE-Fisch	T159522 Add more browser-tests for the TwoColumnConflict extension
Resolved	WMDE-Fisch	T159817 Don't allow horizontal scrolling for changes
Resolved	WMDE-Fisch	T159819 Scroll changes column and editor column exactly line by line
Resolved	Andrew-WMDE	T159821 Remove conflict warning for users of visual editor
Invalid	None	T161708 Mark all text should also work with Command + A
Resolved	WMDE-Fisch	T161784 Review diff formater algorithm.
Resolved	WMDE-Fisch	T162021 Align the column texts perfectly
Invalid	None	T165126 Usability: 'show/hide Unchanged text' button actions confusing, since view of text is not always changed
Resolved	Andrew-WMDE	T165129 Help text of editor column covered by WikiEditor
Resolved	WMDE-Fisch	T165134 Investigate changes needed for Page namespace on Wikisource
Declined	None	T169317 Only use section in conflict resolution if possible
Resolved	• Lea_WMDE	T183223 Analytics: Grafana board with insights into edit conflicts
Declined	GoranSMilovanovic	T181704 Track how many paragraphs usually are involved in an edit conflict
Resolved	GoranSMilovanovic	T182008 How often are new editors involved in edit conflicts
Declined	GoranSMilovanovic	T182011 Differentiate between main, talk and non-talk/main pages
Resolved	GoranSMilovanovic	T182009 Find out which version is used more
Resolved	• Lea_WMDE	T180972 Create prototype for new edit conflict merge approach
Resolved	WMDE-Fisch	T180973 Display conflicting paragraphs side by side, same paragraphs over the whole page layout
Resolved	WMDE-Fisch	T180974 Change text box into editor when the edit symbol was clicked
Resolved	WMDE-Fisch	T182007 Select paragraph versions using a switch button
Invalid	• Hanna_Petruschat_WMDE	T182874 Create a simple mock for the front test page [twoColConflict]
Resolved	Andrew-WMDE	T183363 Show error message in prototype if not all versions have been selected
Resolved	WMDE-Fisch	T185003 Add list of possible articles to the front page of the prototype
Resolved	WMDE-Fisch	T184984 Set up test server for prototype testing
Resolved	WMDE-Fisch	T183362 Change prototype's resolution page for MVP testing
Resolved	Andrew-WMDE	T184992 Small boxes in an edit conflict should have no whitespace inside the box
Resolved	Addshore	T184993 Have a tour to introduce the new Interface
Resolved	Addshore	T187301 Popups appearing in the wrong order
Resolved	WMDE-Fisch	T195711 Make v2 of TwoColConflict: line based edit conflict handling
Resolved	• Lea_WMDE	T195712 Add message text for feedback (No. 1)
Resolved	Andrew-WMDE	T195713 Have an intro tour (No. 2)
Duplicate	None	T198373 Change texts for intro tour (No. 2)
Resolved	• jkroll	T202884 Unwanted greyed out text in tour tip 3/3
Resolved	thiemowmde	T203066 Fix the header overlapping the tour window
Resolved	WMDE-Fisch	T195714 Allow collapsing and uncollapsing not changed text blocks (js version) (No. 4)
Resolved	None	T195716 Change wording in the description of the coloumns (No. 3)
Duplicate	None	T195717 Change order of versions (from" your version, other version" to "other version, your version") (No. 3)
Duplicate	None	T195719 Show "Please choose a version" only once (No. 5)
Duplicate	None	T195720 Change border of radio button outline when selected (No. 6)
Resolved	Andrew-WMDE	T195721 Support JS enhanced editing on the merge view (No. 7)
Resolved	Andrew-WMDE	T203141 Show edit buttons to allow JS enhanced editing
Resolved	WMDE-Fisch	T203144 Show wikitext editor when clicking on enabled edit buttons
Resolved	• jkroll	T205431 Keep frames of text boxes also on Chrome
Resolved	Andrew-WMDE	T195722 Tooltip for unselected paragraphs (No. 7)
Duplicate	None	T195723 Text box behaviour while editing (No. 7)
Resolved	thiemowmde	T195724 Adapt Save-, Preview- and Cancel buttons to new version (No. 8)
Resolved	WMDE-Fisch	T206770 Mixed newline chars irritate the TwoColConflictHelper
Resolved	Andrew-WMDE	T198210 Display conflicting lines side by side and same lines over the whole page layout
Resolved	WMDE-Fisch	T198212 Allow to select versions of the diff
Resolved	WMDE-Fisch	T198213 Save version consisting of selected lines
Resolved	WMDE-Fisch	T198832 Editing paragraphs - non-js version (No.7)
Declined	None	T198833 For non-js, the not used version should be greyed out

Event Timeline

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

• Lea_WMDE created subtask T143824: Show text changes of both parties in edit conflict text field.Aug 24 2016, 7:50 PM

• Lea_WMDE created subtask T143825: Show/hide diff parts of edit merge screen.

• Lea_WMDE created subtask T143826: Not changed text should be collapsible.Aug 24 2016, 7:52 PM

Johan moved this task from In current Tech/News draft to Recently announced in Tech/News on the User-notice board.Aug 24 2016, 10:04 PM

Johan moved this task from Recently announced in Tech/News to Already announced/Archive on the User-notice board.Aug 31 2016, 5:26 AM

• Lea_WMDE mentioned this in T144608: Scroll textfield and editor to the first edit conflict.Sep 2 2016, 3:45 PM

• Lea_WMDE created subtask T144608: Scroll textfield and editor to the first edit conflict.

• Lea_WMDE mentioned this in T144609: Show info about last version on edit merge screen.Sep 2 2016, 3:59 PM

• Lea_WMDE created subtask T144609: Show info about last version on edit merge screen.

• Lea_WMDE mentioned this in T144610: Make edit merge screen responsive.Sep 2 2016, 4:02 PM

• Lea_WMDE created subtask T144610: Make edit merge screen responsive.

• Lea_WMDE created subtask T144611: Investigate edit conflict behavior on mobile.Sep 2 2016, 4:06 PM

• Lea_WMDE created subtask T144612: Open questions for edit conflict.Sep 2 2016, 4:09 PM

• Lea_WMDE added a project: TCB-September Tasks.Sep 12 2016, 1:58 PM

• Lea_WMDE added a project: WMDE-QWERTY-Team-Experimental-Sprint.Sep 12 2016, 4:40 PM

• Lea_WMDE moved this task from In Research Phase to Ready for Development on the German-Community-Wishlist-Main-Wishes board.Sep 16 2016, 10:17 AM

• Lea_WMDE moved this task from Ready for Development to In Research Phase on the German-Community-Wishlist-Main-Wishes board.Sep 23 2016, 3:21 PM

• Lea_WMDE moved this task from In Research Phase to Feature Development on the German-Community-Wishlist-Main-Wishes board.

• Lea_WMDE moved this task from Feature Development to Ready for Development on the German-Community-Wishlist-Main-Wishes board.

• Lea_WMDE updated the task description. (Show Details)Sep 26 2016, 10:04 AM

• Lea_WMDE mentioned this in Two-Column-Edit-Conflict-Merge.Sep 29 2016, 10:28 AM

Tobi_WMDE_SW added a project: WMDE-TechWish.Oct 24 2016, 8:13 AM

Tobi_WMDE_SW closed subtask T143823: Create a MediaWiki extension for side-by-side edit merge screen as Resolved.Nov 16 2016, 11:14 AM

Addshore closed subtask T144608: Scroll textfield and editor to the first edit conflict as Resolved.Jan 31 2017, 12:59 PM

Tobi_WMDE_SW closed subtask T143824: Show text changes of both parties in edit conflict text field as Resolved.Feb 7 2017, 10:40 AM

Tobi_WMDE_SW moved this task from Ready for Development to Feature Development on the German-Community-Wishlist-Main-Wishes board.

Tobi_WMDE_SW removed projects: WMDE-TechWish, WMDE-QWERTY-Team-Experimental-Sprint, TCB-September Tasks.Feb 7 2017, 10:44 AM

Tobi_WMDE_SW closed subtask T143825: Show/hide diff parts of edit merge screen as Resolved.Feb 10 2017, 10:56 AM

WMDE-Fisch added a subtask: T159249: Add link with call for feedback to help dialog.Feb 28 2017, 6:22 PM

WMDE-Fisch added a subtask: T159251: Count the number of resolved edit conflicts.

WMDE-Fisch added a subtask: T158165: Save and reuse filter settings from last solved conflict.

WMDE-Fisch added a subtask: T158083: Allow ignoring the conflict.

WMDE-Fisch added a subtask: T158073: Metrics: TwoColumnEditConflictMerge .Mar 1 2017, 12:15 PM

WMDE-Fisch added a subtask: T156250: Create help dialog for TwoColConflict.

WMDE-Fisch added a subtask: T159522: Add more browser-tests for the TwoColumnConflict extension.Mar 3 2017, 11:45 AM

• Lea_WMDE mentioned this in T159817: Don't allow horizontal scrolling for changes.Mar 7 2017, 11:21 AM

• Lea_WMDE created subtask T159817: Don't allow horizontal scrolling for changes.

• Lea_WMDE created subtask T159819: Scroll changes column and editor column exactly line by line.Mar 7 2017, 11:39 AM

• Lea_WMDE mentioned this in T159821: Remove conflict warning for users of visual editor.Mar 7 2017, 11:56 AM

• Lea_WMDE created subtask T159821: Remove conflict warning for users of visual editor.

Tobi_WMDE_SW closed subtask T159817: Don't allow horizontal scrolling for changes as Resolved.Mar 10 2017, 2:26 PM

Tobi_WMDE_SW closed subtask T159819: Scroll changes column and editor column exactly line by line as Resolved.Mar 14 2017, 9:40 AM

Tobi_WMDE_SW closed subtask T156250: Create help dialog for TwoColConflict as Resolved.

WMDE-Fisch added a subtask: T161708: Mark all text should also work with Command + A.Mar 30 2017, 7:38 AM

WMDE-Fisch added a subtask: T161784: Review diff formater algorithm..

• Lea_WMDE created subtask T162021: Align the column texts perfectly.Apr 3 2017, 8:36 AM

• Lea_WMDE closed subtask T144610: Make edit merge screen responsive as Resolved.Apr 11 2017, 11:53 AM

• Lea_WMDE mentioned this in T162676: Don't allow going back without confirmation of potential data loss.Apr 11 2017, 11:55 AM

• Lea_WMDE closed subtask T159249: Add link with call for feedback to help dialog as Resolved.Apr 11 2017, 1:27 PM

• Lea_WMDE closed subtask T159821: Remove conflict warning for users of visual editor as Resolved.Apr 11 2017, 1:52 PM

• Lea_WMDE closed subtask T159522: Add more browser-tests for the TwoColumnConflict extension as Resolved.Apr 11 2017, 1:55 PM

• Lea_WMDE mentioned this in T162806: Make TwoColConflict a beta feature on all wikis.Apr 12 2017, 3:02 PM

WMDE-Fisch closed subtask T161784: Review diff formater algorithm. as Resolved.May 3 2017, 8:55 AM

Addshore closed subtask T162021: Align the column texts perfectly as Resolved.May 11 2017, 8:51 AM

Jan_Dittrich created subtask T165126: Usability: 'show/hide Unchanged text' button actions confusing, since view of text is not always changed.May 12 2017, 7:23 AM

Jan_Dittrich created subtask T165129: Help text of editor column covered by WikiEditor.May 12 2017, 7:41 AM

• Lea_WMDE added a subtask: T165134: Investigate changes needed for Page namespace on Wikisource.May 12 2017, 8:32 AM

• Lea_WMDE updated the task description. (Show Details)

• Lea_WMDE moved this task from Feature Development to Beta Feature Status / Feature Freeze on the German-Community-Wishlist-Main-Wishes board.

Tobi_WMDE_SW closed subtask T165129: Help text of editor column covered by WikiEditor as Resolved.May 30 2017, 11:06 AM

• Lea_WMDE closed subtask T144611: Investigate edit conflict behavior on mobile as Resolved.Jun 2 2017, 1:54 PM

• Lea_WMDE created subtask T169317: Only use section in conflict resolution if possible.Jun 30 2017, 11:15 AM

Addshore changed the status of subtask T158073: Metrics: TwoColumnEditConflictMerge from Open to Stalled.Aug 31 2017, 10:57 AM

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)

68747470733a2f2f7261772e6769746875622e636f6d2f736d61736877696c736f6e2f6d657267652d636f6e666c696374732f6d61737465722f646f63732f636f6e666c6963742d7265736f6c7574696f6e2e676966.gif (660×933 px, 1 MB)

Gitlab has also done quite some work in this area:

jeblad subscribed.Nov 22 2017, 11:05 AM

• Lea_WMDE closed subtask T169317: Only use section in conflict resolution if possible as Declined.Dec 18 2017, 11:20 AM

• Lea_WMDE added a subtask: T180972: Create prototype for new edit conflict merge approach.Feb 1 2018, 10:15 AM

• Lea_WMDE closed subtask T180972: Create prototype for new edit conflict merge approach as Resolved.Jun 26 2018, 11:09 AM

• Lea_WMDE added a subtask: T195711: Make v2 of TwoColConflict: line based edit conflict handling.Jun 26 2018, 11:13 AM

• Lea_WMDE moved this task from Beta Feature Status / Feature Freeze to Feature Development on the German-Community-Wishlist-Main-Wishes board.Sep 24 2018, 11:45 AM

Dvorapa added a subtask: T169383: Add clickable arrows to add your version above or below current.Nov 16 2018, 2:25 PM

TheDJ unsubscribed.Dec 31 2018, 12:00 PM

• Lea_WMDE moved this task from Feature Development to Beta Feature Status / Feature Freeze on the German-Community-Wishlist-Main-Wishes board.Jan 10 2019, 12:15 PM

• Lea_WMDE closed subtask T183223: Analytics: Grafana board with insights into edit conflicts as Resolved.Jan 25 2019, 12:58 PM

Aklapper added a project: MediaWiki-Page-editing.Sep 30 2019, 9:32 AM

Aklapper added a parent task: T72163: Edit conflicts (tracking).

DannyS712 moved this task from Backlog to Edit conflict on the MediaWiki-Page-editing board.Nov 22 2019, 7:14 AM

WMDE-Fisch closed subtask T165126: Usability: 'show/hide Unchanged text' button actions confusing, since view of text is not always changed as Invalid.Jan 30 2020, 2:46 PM

WMDE-Fisch closed subtask T158165: Save and reuse filter settings from last solved conflict as Invalid.Jan 30 2020, 3:07 PM

WMDE-Fisch closed subtask T195711: Make v2 of TwoColConflict: line based edit conflict handling as Resolved.Jan 30 2020, 3:45 PM

• Hanna_Petruschat_WMDE closed subtask T161708: Mark all text should also work with Command + A as Invalid.Feb 4 2020, 10:06 AM

• Hanna_Petruschat_WMDE removed a subtask: T169383: Add clickable arrows to add your version above or below current.Feb 4 2020, 10:17 AM

awight changed the status of subtask T158073: Metrics: TwoColumnEditConflictMerge from Stalled to Open.Feb 6 2020, 12:43 PM

WMDE-Fisch closed subtask T165134: Investigate changes needed for Page namespace on Wikisource as Resolved.Feb 17 2020, 7:55 AM

Lena_WMDE closed subtask T158073: Metrics: TwoColumnEditConflictMerge as Resolved.Mar 17 2020, 12:32 PM

thiemowmde closed subtask T144612: Open questions for edit conflict as Invalid.Apr 30 2020, 11:49 AM

@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.

@Lea_WMDE: No reply; closing. Please reopen if there is work left.

thiemowmde edited projects, added German-Community-Wishlist; removed TCB-Team (now WMDE-TechWish) (Oct2016-March2017), German-Community-Wishlist-Main-Wishes.Jan 7 2022, 12:57 PM

Ladsgroup edited projects, added User-notice-archive; removed User-notice.Aug 13 2022, 1:53 PM

	F10176794: 68747470733a2f2f7261772e6769746875622e636f6d2f736d61736877696c736f6e2f6d657267652d636f6e666c696374732f6d61737465722f646f63732f636f6e666c6963742d7265736f6c7574696f6e2e676966.gif
	Oct 13 2017, 11:29 AM

Better solutions to edit conflicts (#1)Closed, ResolvedPublicActions

Description

Related ObjectsSearch...

Event Timeline

Better solutions to edit conflicts (#1)
Closed, ResolvedPublic
Actions

Related Objects
Search...