Help talk:Two Column Edit Conflict View

Jump to: navigation, search

About this board

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

By clicking "Add topic", you agree to our Terms of Use and agree to irrevocably release your text under the CC BY-SA 3.0 License and GFDL
IKhitron (talkcontribs)

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.

Christoph Jauera (WMDE) (talkcontribs)

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

IKhitron (talkcontribs)

I can't create a conflict, :-), but if I'll see this, I'll make you a screenshot, of course.

Reply to "Diff"
IKhitron (talkcontribs)

Hello. Is there any manual? There are a lot of features and buttons that I have no idea what do they do. Thank you.

Jan Dittrich (WMDE) (talkcontribs)

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.

IKhitron (talkcontribs)

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.

Reply to "Manual"
Nenntmichruhigip (talkcontribs)

Will it be saved whether I want to see the unchanged text and both or just my changes? If yes: Where (Cookies, server side, …)?

Christoph Jauera (WMDE) (talkcontribs)

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.

Nenntmichruhigip (talkcontribs)

I hadn’t exactly much chance to test it yet :-) But I’d expect it to be useful, yes.

Christoph Jauera (WMDE) (talkcontribs)

Here you go: https://phabricator.wikimedia.org/T158165 as above we will consider it as a possible option in the next steps. :-)

Pearli (talkcontribs)

Hallo,

sollte das nicht eigentlich anders aussehen?

Die Darstellung scheint unter Chrome nicht richtig zu funktionieren.

Pearli (talkcontribs)

ok, hat sich erledigt, die Erweiterung wikEd hat Probleme bereitet. Hier dann erledigt.

Nenntmichruhigip (talkcontribs)

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.

Christoph Jauera (WMDE) (talkcontribs)

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. :-)

Nenntmichruhigip (talkcontribs)

Thanks :-)

There are no older topics