Help talk:Two Column Edit Conflict View

Feedback and discussion page for the Two Column Edit Conflict View.

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

Report a new bug in Phabricator

When getting a conflict on a talk page (because another user has added a comment on the same topic), I would like to be able to "use both", mine after the other (or vice versa, not sure we need both options).

Hi there. Firstly, this is a really great new tool that is much improved over the old system. I was wondering if there could be some way to re-enter a standard editing mode after selecting which changes you wanted to keep from each version? So if you end up choosing one of the changes but want to go back and adjust it before saving then you could.

I had finished a table on an article, but edit conflict won't let me publish, even after a couple of minutes. Why? ~~~~

Hi @HorsesAreNice,

thanks for the report! Can you help us understanding the situation a little bit better? We need to know:

- What did you do? (Do you still have the option of making a screenshot of the situation? Which versions did you select? Did you click on "preview changes" or "show changes"?)

- What did you expect to happen? (Do I understand it correctly that you clicked on "Resolve conflict", thinking that the conflict would be resolved and you would be redirected to the reading version of the article, but that did not happen?)

- What happened instead? (Did the page flicker and then appeared again as if it was a new conflict? Did the changes you make stay, or was everything gone? Or did something entirely different happen?)

Thank you very much in advance!

Lea

Hello, I am an editor from Chinese Wikipedia. This awesome tool has really helped me a lot and I like it very much. Thanks for developing it!

Tracked in Phabricator
Task T208840

I'm getting the edit conflict viewer on every talk page I post on. Just got an edit conflict viewer on wikipedia:Template talk:Edit fully-protected, even though the last edit to the page was three days before mine. And then somehow it both posted my edit and did a null edit afterwards, even though I only clicked "Submit" once. Not sure what's going on here.

Hey, that seems like a important bug! but we will replace the current version of the extension with a totally new version anyway this week (depending on the wiki and your timezone it will go live between Tuesday and Friday).

Should this bug still occur with the new version, please write us or ping me, then I will hand this to the developers!

Cool beans! Thanks for the quick reply. :)

I tried to reproduce the issue but wasn't successful. @Cymru.lass, can you try to explain how exactly you did the edit in your example? I mean, do you use the "Add topic" feature on top of the page? Do you use VisualEditor? Do you click "edit source" on the last paragraph and add your own wikitext?

Hello! I use edit source, not VE. The error is happening on Wikipedia, so no threaded conversations there. I'm trying to remember if it was when I was editing a section or full talk page but I'm coming up blank.

Ok, thanks! Unfortunately this was my test setup, and I couldn't reproduce it. Can you share a few more details about your setup, e.g. your browser, possible browser plugins (e.g. NoScript), Gadgets enabled in your Wikipedia settings, user scripts you are using? Can you try to delete all cookies that contain the wikipedia.org domain, login again, and tell us if the error still happens?

Hi, using Wiki Editor 2010, I have probably same issue while editing Commons. I doesn't occur while editing other wikis. Regards.

Since 1.33.0-wmf.3, I am getting a conflict on every single page, even those in which I submitted the latest change. WikiEditor 2010.

I just had the edit conflict show up when I clicked "edit" on a section in the entry for "luna" on English Wiktionary. I think I'll disable the gadget. I'm using Firefox Quantum 64 if that helps. I always use the wikitext editor (not Visual Editor) and have lots of user scripts and gadgets enabled.

This very broken edit conflict view started appearing for me today. I edited earlier this afternoon (I always use the wikitext editor), and no edit conflict -- I got the normal desired behavior. I log in this evening (US eastern time), and now I get this broken gadget interfering.

Basic symptoms:

• Make sure you're logged in.
• Edit any page or section of a page using the wikitext editor.
• Click the Show preview button.
• Observe that the gadget claims an edit conflict with the last edit, even if that was days ago.
• Observe also that the gadget seems to claim that edits to subsections will replace the content of the entire page, not just the intended subsection.

Does not happen if not logged in.

Happens in both Chrome and Firefox.

Highly undesirable behavior -- I saw no notification that this was going to be suddenly enabled, no explanation of what it was, and I see no clear way of disabling it. Not only is the unexplained and substantial change in UI both confusing and unwanted, but the basic edit conflict feature itself appears to be fundamentally broken.

PS: I'm getting it on every Wiktionary page -- mainspace, Talk, Wiktionary, Category, everything I've tried so far.

I would also like to report that the new one is not working and thinks I want to overwrite Wikidata's project chat.

Hi everyone, thanks for reporting the issue! We are disabling the feature until we found the bug, this really does not sound good. If you are NOT a beta feature user of TwoColConflict, and still had these issues, please let us know!

We believe we fixed the bug yesterday and cannot reproduce the issue anymore. Can you please tell us if this is still happening to anyone of you? If not, I will mark this as resolved. Thanks again for reporting in the first place!

(and I forgot to log in - this was me, Lea)

It does not happen anymore to me (wiktionary projects), thanks!

I re-enabled the feature and so far it seems to be behaving. Whew!

I was adding a new comment on a Chinese Wikipedia community portal subpage (a rather long page) but I double clicked the submit button so I entered edit conflict with myself (due to the signature). That's not a problem in itself, however my Chrome for Android freezed for almost half minute with multiple "Chrome not responding do you want tp force close" window poped up. Even when it stopped freezing, the page performance was still insufficient to actually conduct any operation. Please improve the tool's performance on mobile phone browsers.

We are currently writing on a completely new version of this tool. We will have a look at the mobile performance with this.

Wow that happen??

I am glad I read this before trying the new feature

I really like the new tool! Excellent work; light-years ahead of the earlier UX while resolving an edit conflict.

Thank you for the nice feedback. Sadly other user also had quite some problems with this approach, therefore we are currently starting from scratch developing a new, hopefully even better approach.

You can find a video demonstating it here:

https://commons.wikimedia.org/wiki/File:Walkthrough_of_the_paragraph-based_prototype_for_the_Column_Edit_Conflict_extension.webm

I hope you are satisfied by this too.

This was the first time I used this tool, so I was careful to go through the little “tutorial”. I selected my changes on the left, and I *thought* I had pasted it over my comment on the right, but it ended up getting posted twice. But the edit-conflict directions themselves got pasted onto the talk page! It took about 3 more edits for me to completely clean it up.

Sorry to hear that! We are currently working on a completely new version of the extension. This will hopefully avoid such problems in the future.

As @Chicocvenancio said:

Thanks for this feature

@JoKalliauer, thank you so much for the nice feedback! :-) In case you want to test the new interface more: We've just implemented a test page where you can get simulated edit conflicts. For more informations please see for the German or for the English version.

Agree, it is rather helpful even if not too frequently necessary :) --~~~~

I just recently got an edit conflict which showed up as three columns instead of two; leaving the editors rather squished:

Any idea what's going wrong?

Hi @Evad37, Thanks for reporting this incident. This is nothing we intended to show up. We guess it might be related to gadgets you might use. Could you give us some insights on that? To reproduce this issue or try out the current beta-version you can go to the edit conflict simulation page. We are looking forward to hear some more details. Thank you!

Why is this dont include pictures

Hi Hanna. I have the following gadgets enabled:

• Browsing:
  • Redirect image links to Commons for files hosted there
  • Print options: control how pages are printed (for example, remove images or backgrounds)
  • Twinkle
  • Enable the Teahouse "Ask a question" feature
  • Reference Tooltips
  • FormWizard
• Watchlist:
  • Geonotice
  • Display watchlist notices
  • (This loads the base style for the watchlist. Please do not disable this option.)
  • Display green collapsible arrows and green bullets
  • Display pages on your watchlist that have changed since your last visit in bold
• Editing
  • Add two new dropdown boxes below the edit summary box with some useful default summaries
  • HotCat
  • wikEdDiff
  • Yet Another AFC Helper Script
  • Form for filing disputes at the dispute resolution noticeboard
  • CharInsert: add a toolbar under the edit window for quickly inserting wiki markup and special characters
  • refToolbar: add a "cite" button to the editing toolbar for quick addition of commonly used citation templates
  • Add extra buttons to the old (non-enhanced) editing toolbar
• Appearance
  • Add an [edit] link for the lead section of a page
  • Add a clock to the personal toolbar that displays the current time in UTC and provides a link to purge the current page
  • Display an assessment of an article's quality in its page header
  • Show radio buttons to switch between views of certain content, such as some maps
  • SidebarTranslate: display sidebar language links in English

Other beta features I have enabled are:

• New filters for edit review
• Wikitext syntax highlighting

I also have several user scripts (w:User:Evad37/common.js), but I don't think any of them interact with the editing area. I also have a bunch of css for overriding the Vector typography refresh (m:User:Evad37/global.css) and various other changes (w:User:Evad37/common.css).

And I'm using Google Chrome (version 63) on Windows 7.

I haven't been able to reproduce using the edit conflict simulation. Though I've noticed the simulation doesn't have the proper CharInsert toolbar (shows up in "copy and paste" mode instead of click to insert like in my screenshot above), and it also doesn't have the Wikitext syntax highlighting active.

@Christoph Jauera (WMDE) can you have a look at this? This exceeds my knowledge of potential gadget clashes (@Hanna Petruschat (WMDE))

Hey @Evad37,

thanks for your feedback and the well ordered list of tools you use, this helps a lot to identify the problem. I created a ticket on Phabricator to take track of the issue so we have it on our monitors https://phabricator.wikimedia.org/T184800