Help talk:Paragraph-based Edit Conflict Interface

About this board

Feedback and discussion page for the Paragraph-based Edit Conflict Interface.

Update: We completely revised the interface for this feature based on user feedback and user test.

Report a new bug in Phabricator

You can post in any language here, preferably English or German.

Interface for discussion conflicts is great

Wugapodes (talkcontribs)

I really liked the new edit conflict interface (the one with the radio buttons), but even with that, edit conflicts in discussions were still a pain. It was great for articles or editing the same text, but when adding to a discussion, I found myself, more often than not, just reopening the edit-interface and adding my text again because it was easier. I just got this new paragraph-based interface and it's amazing. I'm really excited about this feature and am thankful to everyone who is working on it!

My only suggestion is to add more helpful tooltips or labels. Having seen the previous radio-button interface, this one confused me a bit and it took me some time to figure out what would happen when I hit "publish". I think RoySmith gave a more detailed description below which was similar to my confusion. I remember when I first got the interface with the radio buttons that there were blue dots that were part of a tutorial or something? Could those be reintroduced?

Seewolf (talkcontribs)


Max Klemm (WMDE) (talkcontribs)

Hi @Wugapodes:, thanks for your feedback. We are glad to hear you like the new interfaces.

Currently, there are no blue buttons in the talk page edit conflict interface, but we will take your feedback into consideration and see how we can improve the tooltips and help text as we roll out the interface to more wikis.  --For the Technical Wishes Team (talkcontribs)


Reply to "Interface for discussion conflicts is great"
Robert McClenon (talkcontribs)

I from time to time get the Edit Conflict message, but find it to be completely useless. It doesn't tell me whether it will be preserving the other editor's edits and adding mine, or what my choice is. How do I attempt to add my edits while ensuring that the other editor's edits are preserved? It doesn't give me useful information.


Skarmory (talkcontribs)

For me, it gives two source views, like in a diff, and you can analyze the two versions there and pick a version or edit a version to include parts from both. I suck at reading the source code and scanning for what's different, but on bigger edits it is very noticeable.

Reply to "Useless Display"

Extension Failed to Work

Zorua Fox (talkcontribs)

When I use this extension on my wiki, i got such errorlog:

VM2235:956  Uncaught TypeError: Cannot read properties of undefined (reading '$ui')
    at RealtimePreview.isScreenWideEnough (<anonymous>:798:893)
    at <anonymous>:793:1381
    at Object.add (<anonymous>:956:537)
    at realtimepreview/init.js (<anonymous>:793:959)
    at runScript (load.php?lang=zh&modules=startup&only=scripts&raw=1&skin=citizen:12:268)
    at Array.<anonymous> (load.php?lang=zh&modules=startup&only=scripts&raw=1&skin=citizen:12:948)
    at flushCssBuffer (load.php?lang=zh&modules=startup&only=scripts&raw=1&skin=citizen:4:956)
Thiemo Kreuz (WMDE) (talkcontribs)

That's an error message from the WikiEditor extension. I can't tell how this is related, sorry. Maybe you need to update that extension first? What was on screen when this error appeared?

Zorua Fox (talkcontribs)

Thanks for the reply, but this is the only error I saw when the issue occurred, and nothing seems to be happening on my backend (including the Nginx logs).Besides my wikieditor is already up to date.

This post was hidden by Zorua Fox (history)
Reply to "Extension Failed to Work"

Unable to figure out how to use feature

Danbloch (talkcontribs)

Feature showed my addition with a check and an "X". I clicked the check. I then clicked "Show preview" and nothing happened. I then gave up.

Thereza Mengs (WMDE) (talkcontribs)

Hey @Danbloch,

we tested the feature on deWiki and it worked. In order to solve your problem, could you please tell me which page you were trying to edit? And if possible also send a link to the diff of the change you were making? We will then try to solve your problem or figure out why it occurs and get back to you.

Danbloch (talkcontribs)
Thereza Mengs (WMDE) (talkcontribs)

Hello @Danbloch,

thank you for the details and information. We have reconstructed your problem and indeed found that the interface seems to fail scrolling to the preview part when clicking the "Show Preview" button. Many thanks, for your awareness and your comment! We have created a Phabricator ticket to resolve the issue. You can also follow-up the next steps there.

Reply to "Unable to figure out how to use feature"
Liz (talkcontribs)

For some reason, this "tool" posts my comments duplicate times, as if I have an edit conflict with myself. I then have to go back and remove the excess comments from the page. This has happened more often than not with this tool. When I have a chance, I'll try to figure out how to disable it.

Thiemo Kreuz (WMDE) (talkcontribs)

Thank you for the report. Unfortunately, I'm not sure what kind of response you expect? Are you able to post some example links where this happened? That would help a lot investigating this issue further. So far it sounds like a long known issue with the edit conflict detection algorithm in MediaWiki core, which is what TwoColConflict depends on. See for example phab:T28821, phab:T36423, phab:T59264, or phab:T222805. TwoColConflict is essentially just an interface on top of that.

Liz (talkcontribs)

Well, when the Beta feature pops up, I get a message to come here to offer feedback so that's what I did. I don't know if I have expectations, I just followed the suggestion to come here and post.

You can see one example of this if you look at my contributions and look at the posting to WP:ANI at 21:03, November 5, 2021. It posts twice in the same moment and the next edit I delete the duplicate entry.

Thiemo Kreuz (WMDE) (talkcontribs)

I would love to do something about this. Let's see. There are two edits, the first at 04:03:14 UTC, the second 27 second later. That's not exactly the same moment. Furthermore, the second edit is marked as a revert. Why is that?

KaiKemmann (talkcontribs)

This happens to me several times a month.

I encounter these "Edit conflicts with myself" when I try to edit my previous edit shortly afterwards to correct some mistake or other.

It is often not possible to choose between different versions (as there are no check boxes or rather check circles offered) so the obvious option is to click "publish" which results in the corrected text passage being appended to the one added in the previous edit.

See here where I tried to correct a small spelling mistake in my previous edit when the "Edit conflict" interface popped up ...

This post was hidden by TMg (history)
Reply to "Argh!"
Robert McClenon (talkcontribs)

The edit conflict interface doesn't indicate whether forcing one's edit through will preserve the edit by the other user or will wipe out the previous edit. Since it doesn't say that the previous edit will be preserved, I have found it best to temporarily save my edit, and back out from it, and apply it again. If the edit conflict interface is meant to preserve the other edit, it should say so. ~~~~

Chris troutman (talkcontribs)

I have the same problem, which is why I'm dropping this gadget. Preventing an edit conflict should make clear about where my comment is going and this interface has never successfully done that for me.

Reply to "Vagueness of Message"
JanB46 (talkcontribs)

Ik gebruik deze ongevraagd verschijnende mogelijkheid liever niet en beschouw hem dan ook als een vervelend obstakel. JanB46 (talk) 06:03, 7 April 2024 (UTC)


well written matrix .

Reply to "Liever niet"

Allow only one editor at a time

Summary by Thiemo Kreuz (WMDE)
Rogermx (talkcontribs)

Why not do away with all this frustrating BS of edits conflicts?

Allow one active editor at a time to work on an article - period. Set a 15 or 30 minute time limit and warn the active editor when the time limit is about to expire. If the active editor does not save their edits before the expiration, Wikipedia discards the edits and opens the article up to a new editor.

Reply to "Allow only one editor at a time"

Triggers without an edit conflict

Summary by Thiemo Kreuz (WMDE)
Jalapeño (talkcontribs)

Hey there,

I'm working on a draft page on the English Wikipedia, more specifically a draft for YouTuber JackSucksAtLife. The issue is that it detects an edit conflict, when there was nothing edited for 3 hours. I just opened up the page and edited it, and then it says that there was an edit conflict. I have no more details. Could someone investigate this?

Thiemo Kreuz (WMDE) (talkcontribs)

I'm afraid this is a long known issue with the conflict detection in MediaWiki core and nothing that can be fixed in this extension. Sorry.

Won't work, page reloads every time the save button is clicked

Summary by Thiemo Kreuz (WMDE)

Issue with the $wgDiff3 configuration.

FunkyBeats99 (talkcontribs)

On my local dev wiki, the (just installed) feature is broken : I choose thanks to the radio buttons which version I want to keep, but when I click save, the page reloads and every conflict paragraph is highlighted in red. None of the options I chose are memorized. If I start over and try to save again, the same thing happens.

Thiemo Kreuz (WMDE) (talkcontribs)

Unfortunately that's not enough information. How was the conflict resolution interface triggered? How many rows of radio buttons appeared? Is JavaScript enabled? Does the JavaScript console show some error? It might also be the configuration of your webserver or PHP somehow not accepting array-structured form variables. But this is all speculation. Sorry.

FunkyBeats99 (talkcontribs)

Thanks for your swift response.

I trigger myself the conflict resolution thanks to two separate accounts (since it is my dev wiki) on two separate browsers (I tried a bunch, does not seem to be the cause of it).

I run MediaWiki 1.35.6 on a local EasyPHP dev server (Apache 2.4.25 x86 - PHP 7.4.19 x86 - MySQL 5.7.17 x86).

Javascript is enabled and works fine. No particular message in browser console either.

The error happens whether there is more than one paragraph or just one.

It seems that if I choose the newest, not saved yet, revision, the page reloads with a red "alert" background-color on conflicting paragraphs and deletes all choices.

If I choose the already saved revision, the paragraphs that had conflicts just disappear, but the page is still not saved: the interface shows then only the unchanged paragraphs, which is really weird.

I hear you about the PHP version, but every other extension works perfectly, so that would be odd.

Might be linked to my other extension configurations, I'll try on a fresh install and keep you posted.

Thiemo Kreuz (WMDE) (talkcontribs)

That sounds really strange. Sorry, I have no idea. I even went back and tested this older version (it's almost 2 years old by now) and it seems to work fine for me. The error sounds like parts (?) of the POST request are lost. Maybe it's an overly aggressive security or spam protection plugin in Apache or PHP?

Tinss (talkcontribs)

After several hours of digging deep in the code, I finally figured out was was causing the issue (at least for me). In includes/GlobalFunctions.php.

function wfMerge(
	string $old,
	string $mine,
	string $yours,
	?string &$simplisticMergeAttempt,
	string &$mergeLeftovers = null
): bool {
	global $wgDiff3;

	# This check may also protect against code injection in
	# case of broken installations.
	$haveDiff3 = $wgDiff3 && file_exists( $wgDiff3 );

	if ( !$haveDiff3 ) {
		wfDebug( "diff3 not found" );
		return false;

file_exists ($wgDiff3) always returns false even if the diff3 tool exists and it's path is correctly set. For that matter, it appears that checking if a file exist outside the server directory always fail, so I suspect this is a security feature.

Just commenting out the return false part fixed everything,