Help talk:Two Column Edit Conflict View

Jump to: navigation, search

About this board

Edit description

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
Summary by Christoph Jauera (WMDE)

Diff algorithm was fixed and improved see https://phabricator.wikimedia.org/T161784

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.

IKhitron (talkcontribs)

Hello, Christoph Jauera (WMDE), see phab:F7057794.

Christoph Jauera (WMDE) (talkcontribs)

Hi @IKhitron "Access Denied: Restricted File" :-(

IKhitron (talkcontribs)

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

Christoph Jauera (WMDE) (talkcontribs)

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

IKhitron (talkcontribs)

You are welcome, and thank you.

Christoph Jauera (WMDE) (talkcontribs)

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

Summary by Lea Voget (WMDE)

The manual will be updated now.

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.

Christoph Jauera (WMDE) (talkcontribs)

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

IKhitron (talkcontribs)

The images are better, indeed, thank you. After the progress, i'll read it and answer you' of course. Thanks.

Lea Voget (WMDE) (talkcontribs)

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

IKhitron (talkcontribs)

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.
Lea Voget (WMDE) (talkcontribs)

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

IKhitron (talkcontribs)

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.

Lea Voget (WMDE) (talkcontribs)

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

IKhitron (talkcontribs)

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

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

Thank you.

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