After we suggest an automatic resolution for the edit conflict, offer a way to get to the manual resolution interface.
This means resubmitting everything (incl. the old rev ID), but avoiding the automatic resolution path.
Description
Description
Details
Details
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Duplicate | None | T213270 Possibility to use both versions of a paragraph in two-col-conflict | |||
| Open | None | T230231 Allow resolution suggestions of edit conflicts on talk pages | |||
| Resolved | Spike | Andrew-WMDE | T240449 Investigation: How to get to the edit conflict UI avoiding the automatic resolution |
Event Timeline
Comment Actions
Change 559116 had a related patch set uploaded (by Andrew-WMDE; owner: Andrew-WMDE):
[mediawiki/core@master] [WIP][POC] Add a way to avoid saving on an EditPage submit
Comment Actions
Change 559119 had a related patch set uploaded (by Andrew-WMDE; owner: Andrew-WMDE):
[mediawiki/extensions/TwoColConflict@master] [WIP][POC] UI should allow for an automatic conflict resolution step
Comment Actions
I roughly looked at the proof of concept patch and it works fine for me and demos how the whole thing could be done. So the question _if_ this can be done is answered. I'm not entirely sure if there might be an easier way without changes to the EditPage.php class. Let's maybe talk about this on Friday.
Comment Actions
Change 559116 abandoned by Andrew-WMDE:
[WIP][POC] Add a way to avoid saving on an EditPage submit
Comment Actions
Change 559119 abandoned by Andrew-WMDE:
[WIP][POC] UI should allow for an automatic conflict resolution step
Comment Actions
Change 559116 restored by Andrew-WMDE:
[WIP][POC] Add a way to avoid saving on an EditPage submit
Comment Actions
Change 559116 abandoned by Andrew-WMDE:
[WIP][POC] Add a way to avoid saving on an EditPage submit