Open main menu

Topic on Help talk:Two Column Edit Conflict View

< Help talk:Two Column Edit Conflict View
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)
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 :-)