I just got this for the first time and was happy to see a new merge tool. It took me a long time to notice the blue tutorial dots, and at first I thought it was something on my screen before I realized I was supposed to click on it. Overall it looks great, and resolving the conflict was pretty intuitive. Thanks for all the work on this.
Help talk:Two Column Edit Conflict View
Jump to navigation
Jump to search
Several times I was put in the edit confilct view while there could be no conflict f.e. last edit by myself an hour ago.
Hi, can you give us links to edits where this happened?
I reported it in phab:T225656
This appears to have just happened to me. Merge tool triggered, indicating there was an edit just now that conflicted with my current edit, however, the tool pulled a January 26 edit in the left column, with the right column indicating the only differences are my new edits, and no indication of other more recent changes.
Jan 26 edit: https://en.wikipedia.org/w/index.php?title=Nacho_Vigalondo&oldid=879581841
My edit: https://en.wikipedia.org/w/index.php?title=Nacho_Vigalondo&oldid=902987739
I was not logged in when I did my initial edit, before publish, I logged in (which is typical, since I sometimes forget to login until after I've already typed up my edit). I did not use the preview button.
The Merge tool triggered after pressing publish. I then opened a new window to type up this report. I opened the original page to grab some edit-stamp links and the history indicates that my new changes have already been committed. I never deployed my publish from the Merge tool page.
edit: that was weird. mediawiki created an IP-address home-page for me while I was logged in on mediawiki. I already had a userpage but it didn't seem to see it.
Is there any update about this? I'm getting this fairly often while making only category edits with HotCat. Not every time, but a good percentage.
I found that this option never worked for me. The only time I encountered conflicts was when writing something in a discussion page and have someone write something before I post my own.
In that case I would like to have the current version and add my own. But the interface seems to force me to choose between one of them.
What I normally do is go back, copy my text additions, and re-edit the page. The conflicts page merely gets in my way, as in the original interface I could have at least (in most cases) copied and edited the text within it.
Am I missing something?
Hello @Tzafrir, thanks for your feedback!
If you want to keep both versions with the new interface, what I suggest you to do is: Copy e.g. your version, and then select the other person's version. You find a small edit pen in the corner of the other person's text field (e.g. see the sceenshots here). If you click that, you can paste your version underneath. When you save, this new version will be published.
Just in case you are wondering, why we did notdesign the feature with specifically this use case in mind: Although many experienced editors encounter edit conflicts the same way as you, about half of edit conflicts actually appear in the main namespace, e.g. on article pages., and all other namespaces make up at most 1/4 of the main namespace conflict volume.
I have to agree with Tzafrir. All the edit conflicts I'm encountering are no conflicts at all, it's annoying not having the option to simply append your own comment to the already existing comment, every time I have to skip the edit conflict page to paste it in manually. This feature doesn't help me at all.
有没有办法恢复到以前版本的工具？这
I believe the question is if it's possible to use an older version of the tool. Unfortunately I'm not sure what "older version" you are referring to? As of now you can turn the "Two column edit conflict" feature off in your Beta preferences. This brings back the original conflict resolution interface as it always was. There was also an earlier prototype we tested. This one did not performed well and is gone. Sorry.
Hello. Is there a way to return to previous version of the tool, a couple of weeks ago? It was wonderful. I can't even understand the current one, but trying to use all the buttons does not help to solve conflicts. If it's impossible, I'll remove it at all. Thank you.
Hi, sorry to hear that. Maybe you can describe us more what your problems with the new interface are, so that we can try to improve it and it's documentation?
Thank you for your answer. No problem. I do not know what to do to resolve the conflict. I see too many buttons. I can't understand what each one is for. I can't find how to edit the current version so I could paste my changes. And so on.
Hi, for our better understanding: did you see/use the help-button? If so, did the help dialogs helped?
One, the previous version was extremally intuitive, so I did not need any help. And two, no, I did not.
I second this. The new version is much more difficult to use.
I had a conflict again. Found the help link, read the help. Now I know what did you want it to be. And yes, it is much more harder to use. So my question, again, is there a way to return to the previous version on my account, or I'll just turn the tool off? Thank you.
There is unfortunately no way to switch to the previous version.
)-:
Hi @IKhitron and @Natureium! The interface you'd like to return to is this version here, right?
It would help us if you could describe a bit what this interface did well that you are missing in the new one. If you can spare a few minutes to describe this, this would be much appreciated.
Best,
Johanna
Yes, it is. Well, it is very unconvenient and very unintuitive. I believe it's possible to solve a conflict using the new version, and it's possible to remember how to do it, but it is not worth. The first version was millions better than the regular wikitool, and in the same time the second version is much worse than the regular one. If I can't use the first version, I use the regular one. I could use the second one if it was the only existing. But if the regular wikitool is much better - why would I not use it? I even did not find a window in the second version with the text that will be published, just parts of it splitten on different windows. Hope it helps.
@IKhitron Thanks for clarifying which versions you're talking about. Trying to get to the bottom of the problem, would you say the new version is inconvenient and unintuitive mainly because you don't see the whole text that will be published? If it's not "just" about that, could you describe a bit more? I know this has turned into a long thread, but your feedback could really help us here. So if you have the time, it would be of much help if you could describe where you have trouble and why (E.g. "I've just run into an edit conflict and I don't know how to select the changes I made before" or "I've made all the changes I want to keep, but I can't see the whole text that will be published").
Also, do you usually run into edit conflicts on talk pages or in articles?
Best,
Johanna
- It's not "just" that, there are other issues.
- I have some time, but I'm not sure I can describe it clearly better. It's just the whole experience, and it isn't usual for me, because regularly I like new features and use them with pleasure.
- Both.
Maybe I can help you other way, Johanna. If it does not bother you, could you please describe me, in a nutshell, what points in the second version should make it better than the first one, and what problems does thay solve? If you could, I can give my feedback on each point, I think. Thank you very much.
@IKhitron Thanks a lot, I really appreciate this. So, we have this summary of the feedback we received on our first beta feature: https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Edit_Conflicts#Test_page_&_feedback_round
These were the points we tried to solve with the new approach. Does that help?
Best,
Johanna
Great, thanks! Well:
- It is hard to find own changes -> It was easy to me in the first version and hard to impossible in the second one.
- It is not clear which column is going to be saved so it is hard to figure out which version I should edit -> It was clear in the first version and absolutely impossible in the second one.
- It should be easier to merge conflicting changes -> I am not sure if it's about the whole process or the one specific point. If whole process, it's much harder now. If the specific point, it's the same as in the first version.
- The selection of the base version is too complicated -> It was simple in the first version, and very frustrating in the second one.
@IKhitron Thank you for this. I'll take your feedback back to the rest of the team, and we might get in touch again if we have more questions.
I've successfully used the previous version of the edit conflict tool quite a few times, however the new version completely failed.
First, it took me uncomfortably long to find and grab a copy of the text I was trying to add. Perhaps it's just because I was seeing the new version for the first time, but it was an unpleasant start.
Next, I was severely puzzled that there was no live edit-box anywhere. I after a bit of effort I did manage to activate the old-text as an edit area and add my own text. I am going to be cautious in commenting because it's my first time seeing the new version, but I have a vague but strong feeling that that this design is very wrong somehow. It's hard to give more specific feedback because the system-as-a-whole failed completely.
After modifying the old-text-area to include my new comment, my natural next steps would be (1) preview and (2) a diff-check, prior to saving. Except the preview button didn't work! Repeated clicks on Preview did nothing. I was unable to get to diff either.
Unable to progress, I went back and tried to review and absorb the conflict-system as a whole, and see if maybe I was missing something. I can pretty much see what you were aiming for, but when I tried the system for expanding/collapsing sections(?) it was either broken or not doing what I expected. I couldn't find any way to get the preview button to work. Somehow the whole design around activating the edit areas felt very wrong.
I was never able to resolve the edit conflict. If I can't go back to the previous version of the tool, I'll have to shut off the Beta-preferences and go back to the "native" conflict resolution system.
This may be a strange comment, but I get this weird feeling that new design went wrong because someone from the VisualEditor or Flow team showed up to take charge.
I see that Phab task T216837 exists to address the non-working preview button. My other impressions of the system should still be reviewed, under the caveat that it's difficult to evaluate the design when it's impossible to complete the process.
Same issue in previewing and diff-check.
Thank you for your input (it is very much appreciated and needed) and sorry for the delayed answer. The problem with the broken preview and diff buttons it known and will be fixed. About the general experience with the new version: We tested both versions with various users of different backgrounds. And while all solutions have there pros and cons and did confuse some users, the new version was understood better by most people and resulted in more conflicts being successfully resolved. We therefore decided for the new version and try to improve it further to be more easily understood and better to use.
Scenario: user or article TP discussion - click on save comment...edit conflict window appears...choose my text to add, thinking it will be added either above or below the conflicted text. Instead, it deletes the conflicted text and adds mine in its place. Why isn’t it simply added above or below the conflicted text instead of deleting one or the other? The tool doesn’t resolve the conflict, it creates one. ~~~~
Hi, thanks for the input. The conflict resolution algorithms can't (yet) detect when two answers have been added independently, since it's working paragraph-wise not linewise. Therefore the conflict resolution pages is shown. The current work-flow would be to merge the two versions by selecting one and copying the other additions to it. There is already a ticket for improving this T213270 – I added a link to your input.
After I’ve copied my post to the “current” (left-hand) side and clicked the checkmark, the Preview button does nothing (using Safari v.12.0.3 on a Macintosh, at enWP & Commons). Sometimes I just cross my fingers and Publish, but if I need to verify that a template or link works as expected, I have to back out and start over, defeating the purpose of the conflict-resolver.
Thanks for the bug-report! I gave it to the developers, so that we can look into it.
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).
This would be great. The conflict view mainly triggers in cases like this for me. For example, two "!votes" on a page should be added sequentially if they both start with a single #. Or if two people respond to the same talk page comment, both at the ::: level, can set the first registered comment to ::: and the second to ::* to keep at the same level but differentiate the second comment. (Not watching page but ping me as needed)
There is no option to merge conflicting edits, is there? It would be really helpful to add this feature...
Hi, thanks for you inputs and the proposals! I create a phabricator-task for this: T213270, so we have it on our radar and can take a look. Can you also take a look at the ticket if this describes your issue well?
@Draceane: have you noticed that you can edit every section to merge in your edits?
@Michael Schönitzer (WMDE): Thanks for creating the ticket. Meanwhile I did find the workaround with edit-and-copy, but as stated by you, this is unintuitive and ugly.
I would be very happy if this came to fruit. 9 out of 9 times the editing conflicts I have are on talk pages. For now the copy-paste workaround works.
So I added a lot of stuff to a cat in Commons and meanwhile someone else changed a few cats. When the edit conflict page generated by this gadget come over, there were some highlighted changes and I could either “publish” or cancel. Where’s my wikitext, though in case I wanna keep it for later?
There’s a link that says «Go to editing area», but it’s not really editing (wikitext) it’s a VE-style gizmo that ate half of what I had typed. Is this your way to create productivity tools? Well, keep it, I’m gonna turn off this thing in my prefs and let you dupe someone else to be your lab rats. Tuvalkin (talk) 19:11, 4 March 2019 (UTC)
Oh and the warning message is precious, showing an unresolved template call: {{#ifeq:{{NAMESPACE}}|{{ns:6}}|[[File:{{PAGENAME}}|350x220px|none]]}}. Classy!
Hey @Tuvalkin, sorry to hear that you ran into problems with an edit conflict.
From your description I cannot entirely see if this is an issue with the Two Column Edit Conflict View beta feature or if this was a problem you ran into while using the classic conflict screen though. If your conflict looked something like this it is the former. If it looked more like that its the latter.
Can you please confirm the one or the other?
Thanks, Christoph
Neither: What I was handed had no textbox nor any other way I could have retrieved the wikitext in question, either in toto or only the affected snippet. (Also: The way you linked those two images, with (…)«#/media/File:», within a remote page, instead of simple (…)«File:» is outright evil.) (Also 2: This Flow contraption has no preview? Wtf?) Tuvalkin (talk) 11:45, 12 March 2019 (UTC)
That sounds indeed very strange then. - If it was neither the one nor the other, than I really have a hard time understanding what happened there. :-/
Do you have the two column edit conflict feature enabled in the beta features section? Could you try to "provoke" a new edit conflict and provide a screenshot of what you're seeing?
To provoke an edit conflict you can just do the following:
- go to a page ( e.g. a subpage of your user page with some content )
- open it in edit mode and make a change ( but don't save it yet! )
- open the same page in edit mode but with another browser ( or a private tab )
- make a ( different ) change in the same line as above and save it
- go back to the first edit and save it
Thanks!
Thanks for looking into the matter. I did turn this gadget off, but I can turn it back on for experiment sake. I will do as you suggest ASAP.
And of course no preview means I could not correct my botched closing tags will be corrected never ever. You guys managed to destroy a wiki’s most basic function with your airhead gadgets. Tuvalkin (talk) 11:48, 12 March 2019 (UTC) (Later:) Oh, it is editable! Fantastic: it's not a button that says edit or that shows a pencil, it's a button that shows both but which is in turn hidden inside another button that shows three dots; all buttons frameless of course, to make it easier. Well, easy it aint. Tuvalkin (talk) 11:51, 12 March 2019 (UTC)
