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.
Help talk:Two Column Edit Conflict View
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
I can't create a conflict, :-), but if I'll see this, I'll make you a screenshot, of course.
Hello. Is there any manual? There are a lot of features and buttons that I have no idea what do they do. Thank you.
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.
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.
[Question] settings saving
Will it be saved whether I want to see the unchanged text and both or just my changes? If yes: Where (Cookies, server side, …)?
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.
I hadn’t exactly much chance to test it yet :-) But I’d expect it to be useful, yes.
Here you go: https://phabricator.wikimedia.org/T158165 as above we will consider it as a possible option in the next steps. :-)
ok, hat sich erledigt, die Erweiterung wikEd hat Probleme bereitet. Hier dann erledigt.
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.