It is yet unclear which possibilities of a preview we will have. The Save button should say "Save changes". More nneds to be discussed.
Stalled until the whole scope is clarified.

@Lea_WMDE : Sorry maybe this question was already answered and I do not remember exactly. I leave that ping here just so it does not get lost. Reopen the ticket if needed.

The Save button should say "Save changes".

It should be called Publish changes, see the discussion on T131132 and T202052.

This includes browser tests

One other question:

We want to have the buttons available during the "normal" conflict process, that's clear. But do we also want to have a Diff with the simulation page? I think we talked about it, but I just realized, that we did not have this before the redesign and wondered if it is really part of this ticket. @Lea_WMDE ^^'

In T195724#4657858, @WMDE-Fisch wrote:

One other question:

We want to have the buttons available during the "normal" conflict process, that's clear. But do we also want to have a Diff with the simulation page? I think we talked about it, but I just realized, that we did not have this before the redesign and wondered if it is really part of this ticket. @Lea_WMDE ^^'

We just had a quick talk and decided, that for the MVP-ish version we want to implement currently this is not needed. I create a follow up ticket though because it would still be very useful.

For the simulation page see T206746

Change 466853 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Re-enable diff and preview buttons

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

Change 466937 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] [WIP] Add conflict screen to preview and diff

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

Change 466853 merged by WMDE-Fisch:
[mediawiki/extensions/TwoColConflict@master] Re-enable diff and preview buttons

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

Change 471062 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Add tests and one new feature to SplitConflictMerger

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

Change 471062 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Add tests and one new feature to SplitConflictMerger

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

Change 466937 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Add conflict screen to preview and diff

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

So what I see right now is

• no preview or diff buttons
• a cancel link, but when I click on it, there is no confirmation

I checked all this and run out of ideas for the moment, unfortunately.

• I have a hard time doing tests at https://tools.wmflabs.org/wmde-editconflict-test/core/index.php, as I don't have a second account there and can't create one. So I'm doing all my tests locally.
• I checked Special:Version, and the setup on tools.wmflabs is up to date.
• For me, the diff and preview buttons show up, as well as the confirmation dialog when clicking cancel. See the attached screenshot.
• Note the simulation page does not have these buttons.

Technical details:

• There is a JavaScript module mediawiki.confirmCloseWindow in core responsible for the confirmation dialog (which shows either "Leaving this page may cause you to lose any changes you have made. […]" or Firefox' default message).
• It is activated via resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js. This still runs in the background of our conflict resolution page, as it is part of the regular editor we replaced.
• There is a "test" function with a check for wgAction = "submit", which is true for us and results in showing the dialog.

Totally unrelated:

• On Special:Version I noticed our extension is listed as "other". Wouldn't it make sense to list it as an "editor"?

oh no, sorry Thiemo, I automatically used the simulation patch :/ Oh man. So basically, we cannot really test this until it is live, right?

I can demonstrate it on my machine – which doesn't help you. :-( Can @WMDE-Fisch create a second account on the the tools.wmflabs.org/wmde-editconflict-test machine, and share the credentials with us?

I should be able to test it live on Thursday anyways, shouldn't I? So I suggest in this special situation not doing anything and I will test it on Thursday afternoon / Friday day.

Change 472409 had a related patch set uploaded (by Addshore; owner: Addshore):
[operations/mediawiki-config@master] Disable wmgUseTwoColConflict everywhere

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

Change 472409 merged by jenkins-bot:
[operations/mediawiki-config@master] Disable wmgUseTwoColConflict everywhere

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

Mentioned in SAL (#wikimedia-operations) [2018-11-08T10:52:29Z] <addshore@deploy1001> Synchronized wmf-config/InitialiseSettings.php: Disable wmgUseTwoColConflict everywhere T209012 T208840 T195724 (duration: 00m 58s)