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?
Help talk:Two Column Edit Conflict View
Can't seem to make this work
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)
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.
Seems to be fixed, got the dialog boxes this time!
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 :)
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.
I use the following gadgets:
- 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 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.
Nope, everything started working as intended for me after the fix.
@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.
Dialog above edit box
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?
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.
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.
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?)
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 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!
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 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), 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.
This is amazing
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.
@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
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.
New interface question
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.
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.
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.
Thank you very much.
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)?
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
Misaligned boxes due to help text disappearing
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 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!
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 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!
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.
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.
'Unchanged text' buttons behaviour is sometimes confusing
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.
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.
@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!
Yes, the radio buttons :)
Color palette (WikimediaUI)
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?)
> 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.
Line Feeds disappeared
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)
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,