| thiemowmde | |
| Nov 27 2018, 2:42 PM |
| F27318528: Screenshot from 2018-11-27 15-40-57.png | |
| Nov 27 2018, 2:42 PM |
Steps to reproduce:
As reported by @Vort here at https://www.mediawiki.org/wiki/Topic:Up5ypjzsdwtu9s35.
[1] The user report is slightly different here.
I can reproduce what you describe as the user report:
Working on a solution for that, I sat together with @Lea_WMDE and we discussed the feature in general - especially looking at the solution for the diff view.
( sorry that this now becomes a more complex matter that is discussed in this ticket )
As a conclusion we decided on not offering a Diff view, since the conflict solving screen already is a diff.
For the preview the way to go is, seeing the preview and underneath the conflict solving screen that has the exact look and settings as the screen the user is coming from. So the diff in the solving screen is not a "newly generated" diff between the "per-submitted" edits and so currently saved one.
Change 478223 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Disable diff button on conflict solving screen
Change 478618 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] [WIP] Refactor conflict view html building
The issue with the statement "the conflict resolution screen already is a diff" is this: It's a diff the users are not familiar with. As a user I want a way to release myself from the limitations of the conflict resolution screen provided by the extension, and continue working in my familiar environment. I want a button to accept the current selections and continue editing in whatever wikitext editor I was using before. There I would then have access to a diff as usual.
Currently this is not possible. The user is stuck in the conflict resolution screen, and all he can effectively do is click "Save".
When we remove the "Diff" button there is no way to tell what clicking "Save" will actually do in the end. The "Preview" is not precise enough to do this, as it contains no indication which parts of my edit survived, and which did not. There is especially no indication which parts of my edit survived without being in a conflict. These are never shown in the colored parts of the conflict resolution screen, but silently appear in the result. This might lead to the situation where I wanted two paragraphs to reference each other, but only one survives, leaving a mashed up result that does not make sense any more.
TL;DR: Agree with the preview functionality. Agree with removing the diff button. But let's add a "Continue editing" button instead.
Change 478977 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Add missing code to not loose edits on the "other" side
Change 478223 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Disable diff button on conflict solving screen
Change 479179 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@wmf/1.33.0-wmf.8] Add missing code to not loose edits on the "other" side
Change 478977 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Add missing code to not loose edits on the "other" side
Change 479179 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@wmf/1.33.0-wmf.8] Add missing code to not loose edits on the "other" side
Mentioned in SAL (#wikimedia-operations) [2018-12-13T19:35:44Z] <dcausse@deploy1001> Synchronized php-1.33.0-wmf.8/extensions/TwoColConflict/: T210501: Add missing code to not loose edits on the other side (duration: 00m 45s)