Maniphest T198213

Save version consisting of selected lines
Closed, ResolvedPublic13 Estimate Story Points
Actions

Description

Compose selected lines and save as resolved conflict
Add an edit summary line that contains the previously entered message (before the conflict occured)
Add a cancel option that leads you to the current version of the page
This is all non-js

Mock
Look at No. 8 of the mock (and resolve the mystery by clicking on it)

Notes

Most likely we will have an action triggering us at the edit page. At this point we will compose the content, and then return it to the usual edit process

Details

Related Gerrit Patches:

mediawiki/extensions/TwoColConflict : master	Clean-ups to SplitTwoColConflict code and tests
mediawiki/extensions/TwoColConflict : master	Save the currently selected version of the diff

Related Objects
Search...

Status	Assigned	Task
Duplicate	None	T86785 Excessive quantity of edits conflict in a busy project page
Open	cscott	T113004 Make it easy to fork, branch, and merge pages (or more)
Open	None	T72163 Edit conflicts (tracking)
Open	None	T139601 Better solutions to edit conflicts (#1)
Open	None	T195711 Make v2 of TwoColConflict: line based edit conflict handling
Resolved	WMDE-Fisch	T198213 Save version consisting of selected lines

Event Timeline

• Lea_WMDE triaged this task as Medium priority.Jun 26 2018, 1:38 PM

• Lea_WMDE created this task.

• Lea_WMDE updated the task description. (Show Details)Jul 3 2018, 7:38 AM

• Lea_WMDE merged a task: T195724: Adapt Save-, Preview- and Cancel buttons to new version (No. 8).

• Lea_WMDE moved this task from Backlog to Tickets ready for pickup on the Two-Column-Edit-Conflict-Merge board.

WMDE-Fisch added a project: WMDE-QWERTY-Sprint-2018-07-31.Jul 31 2018, 12:40 PM

WMDE-Fisch moved this task from Tickets ready for pickup to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.

WMDE-Fisch claimed this task.Jul 31 2018, 3:36 PM

WMDE-Fisch moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2018-07-31 board.

Change 450606 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Save the currently selected version of the diff

https://gerrit.wikimedia.org/r/450606

gerritbot added a project: Patch-For-Review.Aug 6 2018, 4:10 PM

WMDE-Fisch mentioned this in rESCC1f4cbe202b44: Save the currently selected version of the diff.Aug 6 2018, 4:11 PM

WMDE-Fisch moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2018-07-31 board.Aug 6 2018, 4:11 PM

WMDE-Fisch mentioned this in rESCC2092a7a858d5: Save the currently selected version of the diff.Aug 6 2018, 4:34 PM

WMDE-Fisch mentioned this in rESCC507a8f2e906b: Save the currently selected version of the diff.

WMDE-Fisch mentioned this in rESCC1bd36d1c21af: Save the currently selected version of the diff.Aug 9 2018, 1:05 PM

WMDE-Fisch mentioned this in rESCCa4e787dba5c4: Save the currently selected version of the diff.Aug 9 2018, 2:10 PM

Change 452368 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Clean-ups to SplitTwoColConflict code and tests

https://gerrit.wikimedia.org/r/452368

thiemowmde mentioned this in rESCCf3057cc1e361: Clean-ups to SplitTwoColConflict code and tests.Aug 13 2018, 2:02 PM

thiemowmde mentioned this in rESCC0f6793115f47: Save the currently selected version of the diff.Aug 13 2018, 2:54 PM

thiemowmde mentioned this in rESCCa7db4cb715bb: Clean-ups to SplitTwoColConflict code and tests.

Change 450606 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Save the currently selected version of the diff

https://gerrit.wikimedia.org/r/450606

ReleaseTaggerBot added a project: MW-1.32-notes (WMF-deploy-2018-08-14 (1.32.0-wmf.17)).Aug 13 2018, 4:00 PM

WMDE-Fisch moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2018-07-31 board.Aug 14 2018, 7:58 AM

Demoed. It works, but not in the simulation. @WMDE-Fisch: Please make a new task for that.

JStrodt_WMDE closed this task as Resolved.Aug 14 2018, 1:16 PM

JStrodt_WMDE updated the task description. (Show Details)

JStrodt_WMDE moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2018-07-31 board.

Jdforrester-WMF edited projects, added MW-1.32-notes (WMF-deploy-2018-08-21 (1.32.0-wmf.18)); removed MW-1.32-notes (WMF-deploy-2018-08-14 (1.32.0-wmf.17)).Aug 14 2018, 8:55 PM

thiemowmde mentioned this in rESCC5fc7eeb74323: Clean-ups to SplitTwoColConflict code and tests.Aug 15 2018, 9:26 AM

thiemowmde mentioned this in rESCC583901082252: Clean-ups to SplitTwoColConflict code and tests.Aug 15 2018, 9:30 AM

thiemowmde mentioned this in rESCC3ca939b99aa1: Clean-ups to SplitTwoColConflict code and tests.Aug 15 2018, 9:35 AM

thiemowmde mentioned this in rESCCe61390220f6e: Clean-ups to SplitTwoColConflict code and tests.Aug 16 2018, 7:05 AM

WMDE-Fisch mentioned this in rESCCebbd1b4f9ce2: Clean-ups to SplitTwoColConflict code and tests.Aug 16 2018, 8:46 AM

WMDE-Fisch mentioned this in rESCCe2b84d254528: Clean-ups to SplitTwoColConflict code and tests.Aug 16 2018, 8:57 AM

Change 452368 merged by WMDE-Fisch:
[mediawiki/extensions/TwoColConflict@master] Clean-ups to SplitTwoColConflict code and tests