Help talk:Paragraph-based Edit Conflict Interface/Flow

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.

I hit an edit conflict and the merge was complicated. I decided the best thing to do was to get the changes between my version and the version I was originally changing, and then reapply those changes to the current version. But it appears there's no option to get my wikitext back intact; I can only get it in little pieces around where the edit conflicts are. -- ~~~~

Ah,I found a way to do this, but it was not where I expected. Normally the button to show changes or go back to the text you were editing is at the bottom of the form, near the "Preview" and "Publish" buttons. In the beta, it's actually next to the title of the revision, between the preview and the diff conflict resolution area.

+1 I had this exact issue. When an edit conflict ties the edit up into a dozen small sections to compare, it's best to just take my edits and piece it together myself. Usually it shows in the text box but with the new interface, it's hidden. I'd make this "(copy full text)" much more prominent.

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.

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.

The page was en:Talk:Millennials. My change was en:Special:Diff/1169104213. The conflicting change was en:Special:Diff/1169102069/1169103055.

These both were additions at the same point in the file, so the conflicting change appeared first on the edit conflict page, followed by my change.

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.

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.

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.

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.

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?

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 ...

Still happening, as with this edit.

Plotseling storende pop-up gaf verwarring. Ik had kennelijk een toets aangeraakt, die leidde tot dubbele upload van de wijziging. Na enig zoeken bleek de editWikisource:Lijst van gedigitaliseerde Middelnederlandse handschriften en drukken in binnen- en buitenlandse bibliotheken - Wikisource gewoon correct geplaatst te zijn en de pop-up Bewerkingsconflict: Wikisource:Lijst van gedigitaliseerde Middelnederlandse handschriften en drukken in binnen- en buitenlandse bibliotheken - Wikisource moest ik niet gebruiken.

as i said here: Reading/Web/Accessibility_for_reading/Reporting/scn.wikipedia.org

i have all the beta functions activated, but on meta (for example) i dont face this error

In the beginning the interface would often open without any actual reason.

This seems to have gotten a lot better now and the tool has been very helpful to me many times.

I often keep an editor box open for several days and work on the content while in the meantime other editors save changes to the article as well.

The tool does not seem to realize this every time and often will not open.

This leads to two obvious questions which are not answered on the Help page:

• How does the tool figure out whether an edit conflict might be about to happen? Does it actually know that a new version of the article was saved by another editor while I was typing in the editor box on my computer?
• Would it be possible to force the interface to open when I already know that the source text was changed while I was intermittently editing the text in my browser over a longer period? many thanks, ~~~~

Thanks a lot for the nice words. TwoColConflict relies on the existing conflict detection mechanism in MediaWiki core. It remembers the "base revision id" of the revision that was used to start the edit, checks if there is a more recent revision, and if the two happen to touch the same paragraphs. No, it's not possible to enforce this process. You have to click "Publish changes" and see what happens.

In case you want to play around with the feature you can open an anonymous browser window where you are not logged in (or logged in with a second account) and do slightly different edits to the same page (ideally a sandbox page) in the two windows. Whoever saves first wins, and the second one runs into an edit conflict.

The "if the two happen to touch the same paragraphs" point is probably the pivotal aspect. Many times, someone editing "over" you doesn't result in an edit conflict, because they edited some completely different part of the page that your edits don't also touch. There's no need for the conflict resolution interface to open in those cases, so it doesn't. Actual edit conflicts are (thankfully) pretty rare, no matter how long an edit has been in progress or how many times the page has been modified since it was started.

Tracked in Phabricator
Task T373231

When using the "Night" site interface (the dark-mode skin), the "tour" popup labeled "Diverging changes are shown line by line." contains black-on-dark-gray text below that initial heading line (which is rendered in white). No idea if any other interface elements are similarly affected.

I'll also report this over at Reading/Web/Accessibility_for_reading/Reporting/en.wikipedia.org, but presumably it isn't limited to enwiki at all. It's also one of those rare dark-mode issues that can't be fixed with a content tweak, since it's actually an interface bug.

Hi. Just a quick note that I just got the Edit Conflict Interface displayed for this edit reverting vandalism on a talk page. Not sure what happened there. Interestingly the edit had went through without me taking any action on the interface.

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?

+1

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

+1

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.

~~~~

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.