Help talk:Paragraph-based Edit Conflict Interface/2017

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

If you want to tryout the new interface without having to wait for a real edit conflict: We have implemented a temporary test page where you will get simulated edit conflicts.

allow ignoring the conflict

Please give some way of ignoring the conflict, i.e. replacing the article with my version anyway. (Also without JS please :-) ) This is useful for example in the case of me having already noticed and merged the conflict before saving, or having done a typo fix in a slightly different way as part of more changes. I had both of those cases just yesterday, and the prototype and screenshots suggest resolving this would be significantly harder with the new UI. Nenntmichruhigip (talk) 08:55, 14 February 2017 (UTC)

Hi @Nenntmichruhigip,

thanks for the suggestion. I created a ticket on Phabricator https://phabricator.wikimedia.org/T158083 and we will consider it when looking into next features and improvements for the beta version. I also added you as a subscriber there. :-) Christoph Jauera (WMDE) (talk) 18:12, 14 February 2017 (UTC)

Is there a way to get it to post under the conflicted post with an ''edit conflict'' symbol? I'm using Safari, and the last time the edit conflict message appeared, I said to save to my comment, which it did, but it deleted the other comment, so that editor had to post it again. Can it just save both? Atsme (talk) 14:46, 10 June 2017 (UTC)

Hey @Atsme,

the reason for getting an edit conflict page in the first place is, that the program ( in your case ) does not know what post belongs where and it cannot just solve the issue itself. So when you say "Can it just save both?" - it does not know how to do that.

But you might be right, that for specific cases the situation could be improved. That's a general issue with the auto conflict solving algorithm. A link to the diffs of the two edits would be helpful to better understand the issue.

Thanks for your feedback and best,

Christoph Christoph Jauera (WMDE) (talk) 12:14, 12 June 2017 (UTC)

My experiences have been User TP conflicts rather than articles. Not sure if it's possible to isolate a "keep both" command only to TP? ~ Atsme (talk) 12:38, 12 June 2017 (UTC)

Thanks :-) Nenntmichruhigip (talk) 08:18, 15 February 2017 (UTC)

According to the phabricator ticket, checking the box to use your version as the base version and saving should work, but when I just tried it on en-wikipedia it did not save my version. ONUnicorn (talk) 15:34, 12 May 2017 (UTC)

Hi @ONUnicorn, thanks for your feedback!

I tried to reproduce the issue, and since I failed I just want to make sure I understood everything correctly. Is this what happened:

1) You had an edit conflict

2) You saw the two coloumn edit view, and a dialogue box on top of the text editor

3) You changed the default selection, so that it said "use my version"

4) The text editor showed your version

5) You clicked on save, and nothing was saved (or a revision with no contents was saved?)

?

Best,

Lea Lea Voget (WMDE) (talk) 16:45, 15 May 2017 (UTC)

Hi @Lea Voget (WMDE); that's exactly what happened. I pushed the button that said "use my version" and clicked save and nothing was saved. I don't know if the text editor showed my version or not; I just assumed "use my version" would cause it to use my version. ONUnicorn (talk) 18:17, 15 May 2017 (UTC)

@ONUnicorn two more questions :) When you clicked save, what did you see? Did you see the edit conflict window again, or go back to the editing page or did you see the article, just all of your changes lost, and the conflicting version being the last entry in version history? If that is not too much, could you maybe point us to the revision that you clashed with?

Thanks again for helping us detect the problem!

Best,

Lea Lea Voget (WMDE) (talk) 19:03, 16 May 2017 (UTC)

If I remember correctly I just saw the article, all changes lost, and the conflicting version being the last entry in version history. This is the revision I clashed with: [https://en.wikipedia.org/w/index.php?title=Polyoxyfen&oldid=780034379]. ONUnicorn (talk) 20:22, 16 May 2017 (UTC)

@ONUnicorn so, do I understand it correctly, the version you had a conflict with was the creation of a redirect? If that's the case, it might be the reason why it did not work properly as I don't know exactly how conflict resolution behaves in case of a redirect. Will investigate a bit more. Tobias Gritschacher (WMDE) (talk) 12:34, 17 May 2017 (UTC)

@Tobias Gritschacher (WMDE), yes. It was a new article and I was attempting to clean it up and wikify it, then do additional research to see if it was an appropriate article. While I was working on it another new page patroller came along and redirected it, leading to the edit conflict. ONUnicorn (talk) 15:20, 17 May 2017 (UTC)

[Question] settings saving

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Will it be saved whether I want to see the unchanged text and both or just my changes? If yes: Where (Cookies, server side, …)? Nenntmichruhigip (talk) 08:57, 14 February 2017 (UTC)

Hi @Nenntmichruhigip,

thanks for the question. The simple answer is: No. Currently we are not saving the settings and at the moment there are also no plans on doing so. But if you would find it an useful feature we could add it to our list of possible improvements. Christoph Jauera (WMDE) (talk) 18:00, 14 February 2017 (UTC)

I hadn’t exactly much chance to test it yet :-) But I’d expect it to be useful, yes. Nenntmichruhigip (talk) 08:18, 15 February 2017 (UTC)

Here you go: https://phabricator.wikimedia.org/T158165 as above we will consider it as a possible option in the next steps. :-) Christoph Jauera (WMDE) (talk) 09:52, 15 February 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Bearbeitungsfenster fehlt

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Hallo,

sollte das nicht eigentlich anders aussehen? [1]

Die Darstellung scheint unter Chrome nicht richtig zu funktionieren. Pearli (talk) 15:53, 18 February 2017 (UTC)

ok, hat sich erledigt, die Erweiterung wikEd hat Probleme bereitet. Hier dann erledigt. Pearli (talk) 16:03, 18 February 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Manual

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Hello. Is there any manual? There are a lot of features and buttons that I have no idea what do they do. Thank you. IKhitron (talk) 21:25, 9 March 2017 (UTC)

Thanks for your feedback. Could you tell what you fund confusing or unclear? It could help me and my colleges to improve the interface and write a better documentation, so you (and others) don't run into these problems again. Jan Dittrich (WMDE) (talk) 10:27, 10 March 2017 (UTC)

Everything. The page here is not somhelpful, because there is almost nothing in it, and if something is, it has unreadable pictures. It will be nice to have some manual with at least all kinds of workflow. Thanks. IKhitron (talk) 10:31, 10 March 2017 (UTC)

Just a quick update here @IKhitron:

A few days ago we already improved the quality if the images. The text in the tutorial dialog is partly still work in progress. We are currently also gathering user feedback in 1on1 sessions to make it more helpful.

If you have any more thoughts on that topic, please do not hesitate, we really appreciate it.

Best, Christoph Christoph Jauera (WMDE) (talk) 07:49, 30 March 2017 (UTC)

The images are better, indeed, thank you. After the progress, i'll read it and answer you' of course. Thanks. IKhitron (talk) 17:36, 30 March 2017 (UTC)

Hi @IKhitron! We have iterated over the help dialogue, and would like to hear your opinion. Can you have a look at the suggestion on phabricator( https://phabricator.wikimedia.org/T162148 )? Your feedback would be appreciated!

Thanks,

Lea Lea Voget (WMDE) (talk) 21:24, 20 April 2017 (UTC)

Hi. Thank you for the invitation.

1. The parts I understood looks incredibly better.
2. But there are some problems:
3. What are the invisible images?
4. What is the help manual part and where should it be?
5. Pleas should be please, I believe.
6. Still some important parts are missing. IKhitron (talk) 21:33, 20 April 2017 (UTC)

3. should be fixed now :)

4.: In Help:Two Column Edit Conflict View we explain how the extension works. Most of it is identical to the help dialogue, but the text for the first image should differ. This different text is noted on the phabricator ticket.

5. Thanks, fixed!

6. What are the important parts that are missing for you?

Thanks again for your feedback!

Lea Lea Voget (WMDE) (talk) 15:29, 21 April 2017 (UTC)

Thank you.

7. The image #4 shows dialog window. What should we do to open this dialog?

8. If I remember right, there are more buttons that are described now. IKhitron (talk) 16:20, 21 April 2017 (UTC)

7: Good point! I changed the sentence to make it more clear that the box is there without you doing anything. Is that more clear?

8: Yes, you are right, there currently is the "show changes" radiobutton. We will remove that one though (see here). Sorry, I should have told you that :) Lea Voget (WMDE) (talk) 17:35, 21 April 2017 (UTC)

7. Yes, it's better, but I never saw it.

8. No problem. If the manual fits the tool, good for me.

Thank you. IKhitron (talk) 17:38, 21 April 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Diff

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Hello. How do you make a diff? In usual, there is a mediawiki differ. I thought it will be here either. But the "not mine" edit was one word added in the middle of the text, and the tool showed ten lines almost exactly the same twice, as different. Thank you. IKhitron (talk) 21:28, 9 March 2017 (UTC)

Hey @IKhitron,

we use a modified differ to create the unified diff you can see on the right (in RTL) side. Could you provide a screenshot for the problem you described, so I can have a closer look? That would be great.

Thanks for the feedback, best

Christoph Christoph Jauera (WMDE) (talk) 10:56, 10 March 2017 (UTC)

I can't create a conflict, :-), but if I'll see this, I'll make you a screenshot, of course. IKhitron (talk) 12:55, 10 March 2017 (UTC)

Hello, Christoph Jauera (WMDE), see phab:F7057794. IKhitron (talk) 19:50, 28 March 2017 (UTC)

Hi @IKhitron "Access Denied: Restricted File" :-( Christoph Jauera (WMDE) (talk) 08:24, 29 March 2017 (UTC)

Sorry. I didn't know I should give you an access in this system. I opened it for all. Try now, please, Christoph Jauera (WMDE). IKhitron (talk) 09:17, 29 March 2017 (UTC)

Now I get it :-)!

The problem seems to be related to the diff formating algorithm we use. It is slightly different from the one used to generate the table view. I created a ticket for the issue, see https://phabricator.wikimedia.org/T161784

Thanks again @IKhitron Christoph Jauera (WMDE) (talk) 07:43, 30 March 2017 (UTC)

You are welcome, and thank you. IKhitron (talk) 17:33, 30 March 2017 (UTC)

Just a small update here. The custom diff algorithm in the Two Column Edit Conflict View was improved fixed and should now work well again. If you face other issues with this please reopen this thread a create a new one. Thanks :-) Christoph Jauera (WMDE) (talk) 11:26, 25 April 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Line Feeds disappeared

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

After an edit conflict I copied the text I wrote from left of the "two column view" and pasted to the right column: All line feeds disappeared and ruined the table I added: https://de.wikipedia.org/wiki/Spezial:Diff/165283575?title=Wikipedia:Redaktion_Chemie Please check.--Mabschaaf (talk) 12:01, 7 May 2017 (UTC)

Hey @Mabschaaf,

thanks for the feedback. I could reproduce your issue and that really seems to be a problem we did not notice until now. I created a Phabricator ticket right away so we can keep track of it an fix it. https://phabricator.wikimedia.org/T164716

Again thank you very much and best,

Christoph Christoph Jauera (WMDE) (talk) 09:07, 8 May 2017 (UTC)

Thx Mabschaaf (talk) 15:24, 8 May 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Can't seem to make this work

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

When I test an edit conflict, I have what appears to be the correct view, except the right hand column is blurred out for no obvious reason. I assume this shouldn't be the case? Samwalton9 (talk) 12:37, 10 May 2017 (UTC)

I briefly checked back with a developer. We will try to find out why you got just the blurred column and update the extension.

As a manual fix (in the hopefully short meantime): If the blurred text happens, you can "force" the browser to get the part of the page which is seemingly missing by pressing Ctrl+f5. It should be only needed once (Since it seems to connected the "cache" of ones browser; ctrl+f5 forces a rebuild of the cache) Jan Dittrich (WMDE) (talk) 13:51, 10 May 2017 (UTC)

See File:TwoColumnBug.png. Confirmed to occur on both the English Wikipedia and Wikisource. Samwalton9 (talk) 12:41, 10 May 2017 (UTC)

Thanks for reporting! This, indeed should not happen. You should get a dialog that asks you what should be in the editor (your version or the currently saved version). I forward it to my colleagues. Jan Dittrich (WMDE) (talk) 13:36, 10 May 2017 (UTC)

Hi @Samwalton9, we fixed the issue. Thanks again for reporting! I hope that if you have edit conflicts, the function will be helpful, now. If you or anybody else is interested in the technical details of the fix, here is the phabricator issue with linked code changes. Jan Dittrich (WMDE) (talk) 08:49, 11 May 2017 (UTC)

Seems to be fixed, got the dialog boxes this time! Samwalton9 (talk) 09:18, 11 May 2017 (UTC)

@Jan Dittrich (WMDE) - I just got this bug on da-wikipedia a few minutes ago, any idea why? InsaneHacker (talk) 08:50, 12 May 2017 (UTC)

Hi @InsaneHacker, thanks for reporting the bug again! We fail to reproduce it ourselves at the moment - could you help us with some more information if possible? Ideally we would be interested in the output you can see in a js console, but if you don't use that, could you maybe send us a screenshot or let us know the gagdets you are using that may also do something on the page? That would be great :) Lea Voget (WMDE) (talk) 10:30, 12 May 2017 (UTC)

Since I don't encounter edit conflicts that often It'll be a bit hard to replicate, but I'll try to if it happens again. InsaneHacker (talk) 09:54, 15 May 2017 (UTC)

@Jan Dittrich (WMDE)@Lea Voget (WMDE) It happened again, here's a screenshot: [2]

I use the following gadgets:

• HotCat
• A local script that makes it easier to insert warning templates on user talk pages: da:Wikipedia:Velkomstscript/velkomst.js
• Reference Tooltips
• A script which adds an extra tab that I can click to purge a page (not sure if this is a local script).

I've currently enabled the following beta features (including two-column view):

• Page Previews
• Two column edit conflict
• Content translation

I hope this can help pinpoint the problem. InsaneHacker (talk) 11:53, 15 May 2017 (UTC)

@InsaneHacker Thanks for the details, unfortunately, we are still not able to reproduce your issue.

It would help us if you could tell us which browser (and version of the browser) you were using when it happened to you.

Also, if it happens again, could you then try to click on the help-icon (the question mark) and tell us if that opens the help dialog for you? That would help us identifying where the problem lies.

Thank you! Tobias Gritschacher (WMDE) (talk) 15:47, 16 May 2017 (UTC)

@Samwalton9 I'm wondering if you in the meantime had the issue again as well? At the moment we are not able to reproduce the issue that @InsaneHacker reported and we also don't have any reports from other users.

Thank you! Tobias Gritschacher (WMDE) (talk) 15:49, 16 May 2017 (UTC)

Nope, everything started working as intended for me after the fix. Samwalton9 (talk) 16:21, 16 May 2017 (UTC)

@Tobias Gritschacher (WMDE) I don't know if you changed anything, but I got an edit conflict today without the issue. It appears that the problem consisted of the fact that the popup-dialogue box wasn't appearing before. You need to interact with the popup-box to make the contents of the right box un-blurry. It works fine for me now. InsaneHacker (talk) 18:53, 29 May 2017 (UTC)

@InsaneHacker Thanks for the update! We've deployed a few fixes recently, e.g. for Help talk:Paragraph-based Edit Conflict Interface/2017#h-Misaligned_boxes_due_to_help_text_disappearing-2017-05-11T09:31:00.000Z which might have fixed your problem as well. Tobias Gritschacher (WMDE) (talk) 10:59, 30 May 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

'Unchanged text' buttons behaviour is sometimes confusing

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

It took me a number of edit tests to figure out what these buttons did, because they never seemed to change anything. Specifically, I realised that they expand or collapse blocks of text that aren't part of the edit conflict, but text isn't collapsed unless it reaches a certain length. So if you have an edit conflict that only has one or two (or no) other sentences of text, the buttons appear to do nothing. I'd propose changing the behaviour so that the buttons only show when some text has been collapsed to avoid confusion. Samwalton9 (talk) 09:28, 11 May 2017 (UTC)

Thanks a lot for your feedback, in particular your description of your assumptions and observations while you tried to use the function – this helps us a lot to understand how we might tackle this. I filed an issue on phabricator, so we can consider the usability problem you uncovered. Jan Dittrich (WMDE) (talk) 07:26, 12 May 2017 (UTC)

@Samwalton9 just making sure: You are talking about the radio buttons above the text area, not the expand/collapse buttons within the text area, right? Thanks again for all your feedback!

Lea Lea Voget (WMDE) (talk) 11:09, 12 May 2017 (UTC)

Yes, the radio buttons :) Samwalton9 (talk) 11:15, 12 May 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Misaligned boxes due to help text disappearing

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

See File:TwoColumnBug2.png; it seems that the help text above the right column has disappeared, and thus the columns become unaligned. Not sure if this is the intended behaviour or not, but I assume the two boxes should always be aligned. Samwalton9 (talk) 09:31, 11 May 2017 (UTC)

This is not an intended behaviour, thanks for reporting! I created an issue on phabricator Jan Dittrich (WMDE) (talk) 07:42, 12 May 2017 (UTC)

@Samwalton9 we have problems of getting this error ouselves, but looking at the screenshots it seems that you have a gadget installed that works on the page, too. Could you tell us what it is, so we can check that? Thanks! Lea Voget (WMDE) (talk) 10:04, 12 May 2017 (UTC)

I have the following gadgets enabled which may be affecting this: Twinkle, Syntax highlighter, refToolbar, and MoreMenu.

From a little more testing it doesn't happen every time. I just did 2 successfully and then had 2 where it happened. Samwalton9 (talk) 10:30, 12 May 2017 (UTC)

@Samwalton9 We've tried with the Gadgets you've mentioned enabled (except Twinkle which we couldn't enable) but we couldn't reproduce the error. Is there a chance you could try to disable your Gadgets and see if you can still reproduce the error? Also, can you give us some information which browser you're using? Thanks! Tobias Gritschacher (WMDE) (talk) 11:14, 12 May 2017 (UTC)

Just tested it with a fresh account (no gadgets enabled) and had the same issue on the 2nd edit conflict test. I'm using Google Chrome, version 58.0.3029.96; only extension I had enabled is uBlock Origin, but from checking the logs that didn't block anything. Samwalton9 (talk) 11:18, 12 May 2017 (UTC)

Ok, we finally detected a few flaws in the code under certain circumstances that might cause the issue you're describing. We've fixed these issues in https://gerrit.wikimedia.org/r/#/c/353535/but the code will not be deployed until the beginning of next week unfortunately.

Thanks again for reporting and providing all necessary information for us, we hope that the issue will be fixed once the new code is deployed. Tobias Gritschacher (WMDE) (talk) 16:25, 12 May 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

New interface question

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Hi. Maybe I did not understand you well, but I thought that the bubble question should appear once. It appears every time. Why do you thing it is a good idea? Thank you. IKhitron (talk) 07:37, 12 May 2017 (UTC)

Hi @IKhitron, by the bubble question do you mean the pop up that allows you to select your base version? Our reasoning behind always letting users choose their base version is that the base version should be selected depending on the conflict at hand. If you did many small edits, and the other user just changed one paragraph, it might be better to use your version as the base version. However, if you just changed one word and the other user changed a lot of things, it might be better to use the other user's version as the starting point. Lea Voget (WMDE) (talk) 10:40, 12 May 2017 (UTC)

I see. But is there a way to change the choise if I want to do this, and not every time? For me, I'll never answer "my version". Thank you. IKhitron (talk) 11:31, 12 May 2017 (UTC)

Thanks for the specification! I created a phab ticket to keep track of the suggestion. Lea Voget (WMDE) (talk) 12:29, 12 May 2017 (UTC)

Thank you very much. IKhitron (talk) 19:49, 12 May 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Color palette (WikimediaUI)

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

I haven't seen the tool in action, and based only on the screenshots, it seems that the colors aren't taken from the standard WikimediaUI Color palette. Is there any particular reason not to standardize this, or you didn't know about the palette?

(I think this issue applies to the RevSlider as well?) Tar Lócesilion (queta) 08:29, 12 May 2017 (UTC)

> Is there any particular reason not to standardize this

I would like to have the standard colors, too. However, it was difficult to use them in many cases. For example, we use some thin lines in Revision Slider, but a more orange yellow was easier to see than the standard one etc. But thanks for pointing it out, I will think about bringing the UI closer to the standard style. Jan Dittrich (WMDE) (talk) 11:12, 12 May 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Section editing

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Hi, I tried this tool for a conflict in a section, but the conflict view shows the whole page (just like the normal conflict view). Would it be possible to stay in the edited section (and ignore the others)? Darkdadaah (talk) 14:38, 12 May 2017 (UTC)

Hi @Darkdadaah, thanks for the feedback! We discussed the option to handle conflicts on the section level quite a bit. However, currently sections do not have IDs to identify them easily, and using the name as an identifier has very weird edge cases, too. Therefore we decided that for the first version, we will handle conflicts for the whole page. To keep this case in mind, though, I created a phabricator ticket: https://phabricator.wikimedia.org/T165287

Best,

Lea Lea Voget (WMDE) (talk) 08:43, 15 May 2017 (UTC)

Thanks @Lea Voget (WMDE)! Darkdadaah (talk) 15:12, 15 May 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

This is amazing

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Most of the times, the edit conflicts are going away by themselves (as in the auto-resolve edit conflict feature is working), on the few times the Two Column showed up for me it was a much better experience than the old one. I've used basing on my version or on the current version and both worked beautifully. Thanks for this feature. Chico Venancio (talk) 11:10, 16 May 2017 (UTC)

@Chicocvenancio, thank you so much for the great feedback! We're really happy that the feature works well for you :-) If you see any issues or have suggestions for further improvements in the future, please let us know, too! Have a nice day --Birgit Birgit Müller (WMDE) (talk) 06:35, 17 May 2017 (UTC)

There is a more recent situation that led to a lot of edit conflicts, so I've had more opportunities to test the feature. The only thing I found that could improve it is a better direction on what to do to "change" the version you want to work with. I mean, once I started working with the published version, but latter decided it'd be easier to work with my version and then re-apply the changes made by other users. It took me some 3 seconds to realize copy and paste would solve the problem (copy from one column to the other and then re-apply the changes). Maybe another method could be provided (as in keep the radio buttons on top and have them change the text) or the copy and paste method be hinted at in the interface. It is a really small detail though.

The feature has already helped me a lot, edit conflicts are no longer really frustrating, which makes me less frustrated with the users who make three or four edits after posting a response on a talkpage. I haven't experienced edit conflicts in articles with this feature yet, but I imagine it is a lot more rewarding to not have to deal with edit conflicts (as in the magical solution that works most times) or to have an interface that makes it easy to deal with in the main namespace. Chico Venancio (talk) 12:30, 17 May 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Dialog above edit box

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Hi, I'm using this feature on English Wiktionary. It works great, except the dialog is way too wide. I mean the dialog that says "What should initially be in the editor and serve as a basis for combining the conflict versions?", and is over the right text box. It extends way to the right of the page content, so I have to scroll to the right in order to find and press the "OK" button. Could you make the dialog be the same width as the right text box? — Eru·tuon 02:26, 24 May 2017 (UTC)

Hi @Erutuon,

I assume you use the feature on a relatively narrow screen. I tried it myself and could reproduce the issue. Here is the task on Phabricator I created: https://phabricator.wikimedia.org/T166232

Thanks for your feedback we appreciate it :-), best

Christoph Christoph Jauera (WMDE) (talk) 15:33, 24 May 2017 (UTC)

Well, I have a medium-sized laptop, perhaps 15 inches diagonally. Another factor is that I typically have my zoom size set to 150% while viewing English Wiktionary. Anyway, I reopened this because the problem still exists: see File:Two column edit conflict bug.png. — Eru·tuon 03:14, 8 June 2017 (UTC)

Hey @Erutuon,

the issue should be fixed by now. I tested it with zoom and narrow screens. You should now always be able to reach the OK, button. It would be great if you could confirm though.

Thanks and best,

Christoph Christoph Jauera (WMDE) (talk) 09:37, 22 June 2017 (UTC)

Sorry for the slow response. I had to wait for an edit conflict before I could respond. I just had an edit conflict and the dialog box looks fine now. Thank you so much! — Eru·tuon 18:22, 25 July 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

The tool should not work for "new topic" edits

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Thank you. IKhitron (talk) 09:23, 2 June 2017 (UTC)

Hi @IKhitron, could you elaborate a bit more? What should the tool not do for "new topic" edits and what do you mean by "new topic" edits? Thank you! Lea Voget (WMDE) (talk) 12:45, 2 June 2017 (UTC)

Hi Lea Voget (WMDE). Here you are. I open a talk page. I click on wiki code edit of the last section. I work on it 5 minutes. Meanwhile, somebody else clicks add section, writes something and saves. Somebody third answer him in this section and saves. Then I save and get into the tool. It shouldn't be like that, because the mechanism recognizes work on different sections. IKhitron (talk) 12:51, 2 June 2017 (UTC)

Thanks for the specification! Unfortunately this is nothing our tool can improve. The new page appears whenever the old conflict resolution page would appear as well - only with a new layout. So since we did not change the conflict detection behavior, we cannot improve the situation here :( Lea Voget (WMDE) (talk) 13:30, 2 June 2017 (UTC)

Pity and thank you. IKhitron (talk) 13:30, 2 June 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Missing second column

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

I am not able to solve edit conflict, second column is missing or placed over the first.

Using Vivaldi

phab:T167503

also translation would be very useful. JAn Dudík (talk) 12:18, 9 June 2017 (UTC)

Hey @JAn Dudík,

thanks for the feedback. I will post an answer and some questions in the ticket, the dev audience on Phabricator is a bit bigger :-).

Best,

Christoph Christoph Jauera (WMDE) (talk) 12:54, 12 June 2017 (UTC)

P.S.: regarding translations, this is done by the community on Translatewiki. If you like to help there please see https://translatewiki.net/wiki/Special:Translate/ext-twocolconflict every bit is appreciated :-). Christoph Jauera (WMDE) (talk) 13:09, 12 June 2017 (UTC)

Hey @JAn Dudík,

as stated in the Phabricator ticket, we assume the issue was solely related to the wikEd gadget. We temporarily deactivated that for the two column view. It would be great if you could confirm, when the conflict screen is now working for you or if you got any more issues.

Thanks and best,

Christoph Christoph Jauera (WMDE) (talk) 08:41, 18 July 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Please remove this feature

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Please remove this feature, it only shows the most recent version. Though there are some buttons that should allow you to retrieve you own edits, but the buttons are behind the box with the most recent version. On my notebook, all the buttons and boxes are all superimposing each other, creating a chaos. i am using Chrome and am not zooming my screen in.

Please remove this feature so my edits do not get lost every time. Farang Rak Tham (talk) 13:17, 20 June 2017 (UTC)

Hello Farang,

Thanks for letting us know that the function causes problems. Did you make, by any chance, a screenshot of how it looked like on your screen? By that we could possibly track what caused the problem.

As a quick fix, you can disable the function in the settings for beta features – but our aim would be that the feature works for all users.

(@Christoph Jauera (WMDE) – do you have an idea what caused the problem?) Jan Dittrich (WMDE) (talk) 14:15, 20 June 2017 (UTC)

Yes, i did. How do I send it to you?

It could be that there is a conflict with other functions I have enabled, of which you can see a list here. It may also be my fault that I have too much enabled. Farang Rak Tham (talk) 14:44, 20 June 2017 (UTC)

> Yes, i did. How do I send it to you?

Easiest would be a local upload here or upload at imgur and paste the link here.

> conflict with other functions I have enabled,

Thanks! This can be very helpful to know Jan Dittrich (WMDE) (talk) 15:23, 20 June 2017 (UTC)

Okay, Jan Dittrich, this is the screenshot: File:Schermafdruk 2017-06-20 15.22.10.png Farang Rak Tham (talk) 00:06, 21 June 2017 (UTC)

Thanks for the screenshot! I created an ticket on phabricator for this problem and put the screenshot there, too. (Phabricator is the platform the developers use to keep track of such issues) Jan Dittrich (WMDE) (talk) 10:02, 21 June 2017 (UTC)

Okay, thanks. :-) Farang Rak Tham (talk) 18:50, 21 June 2017 (UTC)

Hey @Farang Rak Tham,

also thank from my side for the feedback and the screenshot. That really looks nasty. To reproduce and fix the issue it would be really great if you could provide us with some additional input:

- What browser in what version do you use? ( it looks like Firefox from the screenshot but you can never be sure enough ;-) )

- Do you have any Gadgets or special user scripts activated and which ones?

Thanks and best,

Christoph Christoph Jauera (WMDE) (talk) 09:28, 22 June 2017 (UTC)

Ah sorry I failed to notice the list of gadgets in the ticket. So please ignore my last point :-). Christoph Jauera (WMDE) (talk) 09:39, 22 June 2017 (UTC)

Hello @Christoph Jauera (WMDE), I use Chrome 58.0.3029.110 (64-bit). Thanks for the follow-up. Farang Rak Tham (talk) 13:30, 22 June 2017 (UTC)

I also have a list of Chrome apps installed, but is that relevant? Farang Rak Tham (talk) 13:31, 22 June 2017 (UTC)

Hey, thanks. I think the issue is more related to gadgets and scripts so the Chrome apps are probably irrelevant. But if you don't mind sharing them, it could be important still. Christoph Jauera (WMDE) (talk) 15:59, 22 June 2017 (UTC)

Hey @Farang Rak Tham I tested the scripts in your common.js and they seem fine.

I then took a look at the wikEd gadget in the user preferences and it seems to be the reason for the broken edit conflict page. I assume you have the gadget enabled in your settings.

It would be great if you could disable the gadget and try to test the new edit conflict screen without it. Just so I can confirm the reason for the broken page.

Since wikEd is used a lot we will definitely think of a solution for the wikEd users, so they can use our new feature. I will keep you updated.

Thanks again and best,

Christoph Christoph Jauera (WMDE) (talk) 10:15, 23 June 2017 (UTC)

It is rather difficult to simulate an edit conflict, because of the timing. Perhaps you can let me know when you are editing some article, and I will then edit that article as well to trigger a conflict. Thank you. Farang Rak Tham (talk) 13:06, 23 June 2017 (UTC)

Hehe, there is a way to create a conflict with yourself. This is how you do it:

1) Create a test page in your user namespace, e.g.: User:Farang Rak Tham/Test

2) Add some lines of text to that page and save it.

3) Now open the page again to edit it. But for now just leave it open and don't do anything.

4) Now open another browser window in private browsing mode where you edit the page. ( you will act as an anonymous user there )

5) Change the text you added originally and save.

6) Now go back to your browser window where you are logged in as regular user ( with the still open editor ) and change the same part of the text ( but change it to something else )

7) When you now save you should get an edit conflict ( with yourself as anonymous user )

Done. ( thats also how I do it when I need to test the whole thing ;-) ) Christoph Jauera (WMDE) (talk) 13:55, 23 June 2017 (UTC)

Dear all,

I have tried editing on another language Wikipedia, and the problem no longer occurs. On that language, WikEd is not operating. So it may well be WikEd that is causing the problems described. I found the edit conflict editor easy to use. Nice work! Farang Rak Tham (talk) 11:30, 17 July 2017 (UTC)

Thanks for the feedback. Will close the issue for now. Christoph Jauera (WMDE) (talk) 12:17, 17 July 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Feedback at enwiki's VPT

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

You may want to look at this feedback: https://en.wikipedia.org/wiki/Wikipedia:Village_pump_(technical)#Edit_conflict_options_spoiling_my_edit Whatamidoing (WMF) (talk) 22:16, 11 September 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Feedback on the edit conflict options

@DePiep I want to come back to your feedback in the village pump discussion now archived.

The two column edit conflict handling is currently in beta and regarding your post: Clearly, in comparison to the 'old' edit conflict handling it uses more elements, colors and dialogue boxes. To help new users there we show a small walk-through tutorial on first sight.

With all that we try to solve the problem, that users in the past a) had no idea what happened or whether something has happened at all and b) found it annoyingly complicated to resolve conflicts with the 'old' interface. We gathered feedback around that from many editors and as a result came up with the current version.

However, this is a beta feature test with the goal to find out, if the workflow of the new interface works well under live conditions. For this, any feedback is welcome and valuable to improve the current version of the feature. So far the reception was quite good, but also some users pointed out that the interface could be more intuitive. So we are open for suggestions and ideas.

Thanks,

Christoph

p.s.: As edit conflicts do not appear quite often we are currently working on a simple way to simulate them with the new interface so users can test it more easy without having to wait for a conflict to appear. If you're interested I will get back to that in this thread as soon as it's deployed. Christoph Jauera (WMDE) (talk) 14:09, 21 September 2017 (UTC)

Thanks. I've responded here. DePiep (talk) 10:41, 4 November 2017 (UTC)

totally breaks the page edit mode on wikisource

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Hi,

on wikisource, in Page edition mode (page image with text box on the side), this gadget totally breaks edition, with the total disparition of the image...

Not good at all ! Hsarrazin (talk) 10:40, 23 September 2017 (UTC)

I second Hsarrazin feedback. It also breaks the Index namespace interface. Aristoi (talk) 10:43, 23 September 2017 (UTC)

Thanks for the feedback you two, I created a ticket on Phabricator and we will look at the issue. If you stumble over an edit conflict again, it would be great if you could provide us some screenshots.

Best,

Christoph Christoph Jauera (WMDE) (talk) 11:45, 26 September 2017 (UTC)

Thanks for the ticket. T176738

I just uploaded screenshots :)

I also added @Tpt who is our main (and only) developper, for the moment ^^ Hsarrazin (talk) 12:26, 26 September 2017 (UTC)

Little follow up here: This is actually a duplicate of https://phabricator.wikimedia.org/T176393 - so there is already work being done to fix that. Christoph Jauera (WMDE) (talk) 13:07, 26 September 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Make it remember the choice

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

Hi,

Everytime I have an edit conflict, the system asks me which version I want to edit - the current one, or the one that I've been editing. And everytime I make one and the same choice (which is I choose to edit the current version and just copy and paste my own text). So my suggestion is to make it remember my choice to save my (and other experienced editors') time, but leave some descreet option to switch it on the go, if it's technically possible, of course. If it's not, I would like to have such an option in the preferences - thus only really experienced users, who really know what they prefer, would be able to use it. Piramidion (talk) 07:28, 2 October 2017 (UTC)

Thanks for you description of the problem! I know that my college Hanna is currently thinking about improving the dialog, I mention her here so she gets to know about this issue – @Hanna Petruschat (WMDE) Jan Dittrich (WMDE) (talk) 12:33, 2 October 2017 (UTC)

See also phab:T165154. IKhitron (talk) 13:00, 2 October 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

better than before

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

As @Chicocvenancio said:

Thanks for this feature JoKalliauer (talk) 15:07, 7 October 2017 (UTC)

@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 [3]for the German or [4]for the English version. Birgit Müller (WMDE) (talk) 21:18, 12 October 2017 (UTC)

Agree, it is rather helpful even if not too frequently necessary :) --~ Deinocheirus (talk) 17:46, 14 July 2018 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Add a button to change the version in the editor again

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

After once having selected the version, that should be shown in the editor (right column) I can't change to the other version any more. I would regard it as helpful if a button would be added that makes such a change possible. The button should create a message that informs the user that if the version is changed now any changes made in the right column will be overwritten by the version to which is changed, followed by the buttons "change to ...version" and "cancel".

The feature is very helpful and improves the solving of edit conflict a lot. X black X (talk) 10:38, 16 October 2017 (UTC)

Hey @X:: black ::X

Thanks for your feedback. I created a ticket on Phabricator to keep track of the issue: https://phabricator.wikimedia.org/T178488

I'm happy you like the feature :-), best

Christoph Christoph Jauera (WMDE) (talk) 12:47, 18 October 2017 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.

Three columns

The following discussion is closed. Please do not modify it. Subsequent comments should be made on the appropriate discussion page. No further edits should be made to this discussion.

---

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

<figure-inline></figure-inline>

Any idea what's going wrong? Evad37 (talk) 04:07, 18 December 2017 (UTC)

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! Hanna Petruschat (WMDE) (talk) 17:24, 19 December 2017 (UTC)

Why is this dont include pictures 105.112.34.218 (talk) 16:37, 3 July 2018 (UTC)

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. Evad37 (talk) 01:10, 20 December 2017 (UTC)

@Christoph Jauera (WMDE) can you have a look at this? This exceeds my knowledge of potential gadget clashes (@Hanna Petruschat (WMDE)) Jan Dittrich (WMDE) (talk) 12:19, 11 January 2018 (UTC)

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 Christoph Jauera (WMDE) (talk) 14:03, 12 January 2018 (UTC)

The discussion above is closed. Please do not modify it. No further edits should be made to this discussion.