Page MenuHomePhabricator

Save version consisting of selected lines
Closed, ResolvedPublic13 Story Points

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

Event Timeline

Lea_WMDE triaged this task as Normal priority.Jun 26 2018, 1:38 PM
Lea_WMDE created this task.
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

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

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

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

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.

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

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