Help talk:Two Column Edit Conflict View

Jump to navigation Jump to search

About this board

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

Update: We completely revised the interface for this feature based on user feedback and user test.

Report a new bug in Phabricator

You can post in any language here, preferably English or German.

Falsches Dilemma

1
Summary by Thiemo Kreuz (WMDE)
Man77 (talkcontribs)

Wie ich gerade erlebt habe, ist die Lösung eines BK nicht immer, dass man sich für eine der zwei Versionen einer Zeile entscheidet. In einer Diskussion antwortet Benutzer B einzeilig auf einen Beitrag von Benutzer A, während Benutzer C selbst an einer einzeiligen Antwort schreibt und beim Speichern in den BK-Modus kommt. Dort muss er sich entscheiden, ob er seine Antwort oder die von Benutzer B speichern will.

In der früheren Softwarelösung war es so, dass man von der eigenen Version was kopieren konnte und in die momentan gespeicherte einfügen konnte. Das geht jetzt scheinbar nicht. Man muss die Zeile von B oder C nehmen und die andere verschmähen. Das ist eine Verschlimmbesserung.

Ich bitte darum, dass das Ding so weiterentwickelt wird, dass man auch bestimmen kann, dass beide Versionen genommen werden und der Text der eigenen über oder unter den der fremden Version eingesetzt wird. Bei mehrzeiligen BKs ist das vielleicht ein bisschen komplex, aber in meinen Augen ist da eine Nachbesserung unumgänglich. Ich arbeite lieber mit einem etwas mühsamen altbackenen Interface als mit einem hippen, das in der Praxis nicht verlässlich anwendbar ist.

Reply to "Falsches Dilemma"

1 second interval

2
Summary by Thiemo Kreuz (WMDE)
Omotecho (talkcontribs)

I am working on old iPad, Safari, web view, keyboard connected with Bluetooth, so maybe it has its own limitation; the interface shows edit conflict with myself by my own edit one second ago.

Thiemo Kreuz (WMDE) (talkcontribs)

We are aware of this issue and try to gather information about it in phab:T222805.

Reply to "1 second interval"
Taste1at (talkcontribs)

The new feature saved me a lot of time. Thanks.

Reply to "Very nice feature!"

维基百科如何添加一二级目录,维基百科内链接怎么添加

4
Wlchunxiaodi (talkcontribs)

维基百科如何添加一二级目录,维基百科内链接怎么添加

Camouflaged Mirage (talkcontribs)

您好,一级就这样 == (内容) == 。第二级就这样 === (内容) ===。至于内部链接,想链接的部分放入[[(链接页面名称)]]。如果有不懂的地方,可以去中文维基互助客栈/求助寻求。

Thiemo Kreuz (WMDE) (talkcontribs)

I'm sorry, but I'm afraid I don't get the question. According to the Google Translate service the question is "Wikipedia how to add a primary and secondary directories, how to add links in Wikipedia", which does not make a lot of sense to me. Are you able to post in English?

Camouflaged Mirage (talkcontribs)

Hello, I had replied in zh to their question. Thanks for your attention.

Reply to "维基百科如何添加一二级目录,维基百科内链接怎么添加"

Many False Positive Conflicts

22
Btphelps (talkcontribs)
Thiemo Kreuz (WMDE) (talkcontribs)

As far as we are aware of, there is no way the TwoColConflict feature can influence the number of conflicts users run into. All the feature is supposed to do is providing a better interface after a conflict happened. You can disable it in your "Beta" preferences and see if this changes anything. Are you still running into conflicts then? Please let us know!

70.102.106.34 (talkcontribs)

I disabled the beta feature. It apparently wasn't the problem. I am still experiencing many false positive edit conflicts. How can I fix this?

Thiemo Kreuz (WMDE) (talkcontribs)

We are very much curious and would love to know more about this. We created phab:T222805 to collect all we know about this issue. Unfortunately it looks like it is very hard to track. It might be related to the webbrowser or a browser extension you use. Possibly even some malware silently running on your computer. It could be your computer mouse or your hand accidentally doing double-clicks whenever you click a save button. If you have an idea, please let us know.

Btphelps (talkcontribs)

I can reproduce the issue very readily in my home laptop. I'll try disabling all browser extensions, experiment, and report back.

Ravensfire (talkcontribs)
Ravensfire (talkcontribs)

Did a very quick test on this scenario, where I created one archive (12) and quickly added text and saved, no problem. I created another one (https://en.wikipedia.org/wiki/User_talk:Ravensfire/Archive_13) where I clicked on Create Source, then ignored it, using other tabs and brower windows for several minutes, then added text and saved. Boom, edit conflict happened. I wonder if the time involved could be an issue, or using multiple tabs / windows or a combination of these?

Alsee (talkcontribs)

If anyone encounters this repeatedly I would consider whether it might be a symptom of a mouse button beginning to flake-out. Junk edit conflicts can come up when multiple clicks register on the save button.

I think I recall a current-or-recent discussion at English Village Pump (Technical) where someone was getting edit conflicts and they eventually concluded it was a mouse issue.

Btphelps (talkcontribs)

It's not related to a mouse. It's browser-specific. It only happens with Chrome.

Spiffy sperry (talkcontribs)

False positives happen frequently when I use Chrome and single-click the "Publish changes" button. (I ignore the conflict, because my edit went through.) When I double-click the button (even though a single-click is sufficient), I do not get the false positive. None of this happens with other browsers I use.

Adamw (talkcontribs)

If anyone experiencing this bug is able to post a screenshot of the conflict, that might provide some helpful clues. The "tabs" and "double-click" theories are unlikely because it's impossible to create an edit conflict with yourself (actually, this has always been a dangerous feature but not something we can tackle at the moment). Maybe the browser is sending both a logged-in and a logged-out submission... More information needed!

Curb Safe Charmer (talkcontribs)
Adamw (talkcontribs)

Thanks! Well, it seems like you did get an edit conflict with yourself, which surprises me. You were making the second edit using the same username, I assume? Is there anything else you can say about what happened? From the edit summary, I'm guessing the first edit was made using a toollabs service "reFill 2"? I'm not familiar with that tool but according to the documentation you submit the page in a toollabs form, probably in a separate tab. This means the page you're working on will be updated relative to what is loaded in the other tab. Depending on how you arrived at the editing page, maybe it's targeting a specific oldid, or maybe you already have the editor open while you run reFill in the second tab?

Either way, now I can imagine why this is happening. Try reloading your editor tab after using reFill: #1 save any outstanding changes and arrive on the article's "Read" tab, #2 run Refill in the second tab, #3 reopen the editor. Hopefully this improves the situation for you!

Curb Safe Charmer (talkcontribs)

@Adamw the reFill thing is a red herring. I've just done an undo on an IP editor's edit to the en article on Praveen Linga. I hadn't run reFill on this article - at least not recently. Up came the edit conflict comparison. I have a screenshot if you need it.

Btphelps (talkcontribs)

I can avoid an edit conflict if I click Submit twice, rapidly. But the editor reopens the article in edit mode.

Spiffy sperry (talkcontribs)
Adamw (talkcontribs)

Hi, thanks. These screenshots are interesting… The new interface might give a bit more information about the conflict, but even from this I suspect that something unusual is happening. It does seem that you were the only one editing, and from the timestamps it looks like you did successfully save a version of the article, immediately before seeing the conflict. I've created Phabricator task T246440 which might be related, I'm not sure yet.

Spiffy sperry (talkcontribs)

I may have a better clue as to what the problem is. It seems when I click on the Submit button, whether with the mouse or by tapping a touchscreen, I may get the phantom edit conflict. However, if I instead press the enter button on the keyboard while the cursor is in the edit summary field (which I rarely did until now), there is no edit conflict.

Thiemo Kreuz (WMDE) (talkcontribs)

Thanks a lot for this insight! As far as I know the only difference between the two actions is that clicking the button submits the buttons wpSubmit value, while pressing enter in a textfield does not. I had a quick look and could not spot any code doing anything with the extra value. That's puzzling. We will definitely look closer into this.

Btphelps (talkcontribs)

I confirm Spiffy sperry's experience, hitting ENTER does not cause a conflicting edit.

Alsee (talkcontribs)

I received one false-positive edit conflict. Here's the diff. The previous edit was two months ago. I made an edit, set the edit summary, and I clicked PUBLISH. The new edit conflict screen came up. It gave me the option to merge my edits into the current version of the page, but I saw no conflicting content to resolve. I was puzzled so I checked the page history. I found my edit had already been saved, with no other recent edit I could have conflicted with. I then abandoned the unneeded edit-conflict screen.

Edit: I just had another one. Here's the second diff. The new event report would be otherwise identical to my report above.

Adamw (talkcontribs)

I found no logging from these empty conflicts, which is strange. There should have been no way to show a conflict page without also logging... A screenshot of the conflict page might have additional clues, please snap one if this happens again.

Reply to "Many False Positive Conflicts"

You cannot edit the comment of someone else

2
Romaine (talkcontribs)

On the page there is the text "You cannot edit the comment of the person you have the edit conflict with, because there should be no need for you to edit the comment of someone else in a discussion." This might be the case on some Wikipedia's, on other Wikipedia's this is allowed or is allowed in certain circumstances. For example, I know users that have specifically have indicated that they would appreciate and allow other users to help them with fixing spelling. Also the indentation can use a fix. And more. Please don't state this is an absolute fact.

Max Klemm (WMDE) (talkcontribs)

@Romaine: Thanks for your perspective on this part of the interface. And I am sorry if you understood this as an 'absolute fact'. I just wanted to give an explanation why we decided for this. Max Klemm (WMDE) (talk) 09:19, 27 February 2020 (UTC)

Reply to "You cannot edit the comment of someone else"

WMDE additional edit conflict resolution idea

2
Camouflaged Mirage (talkcontribs)

Per the message to village pump, I think this is a good idea. Will be certainly helpful as the entire chunk of text I inputed can be copied rather than the previous kind where I either have to search deep in the page to find the chunk (the bottom part "My Text") or rather need to copy line by line (diff view). Thanks for the idea.

Reception123 (talkcontribs)

I agree with Camouflaged Mirage. Edit conflicts are annoying and it's great to see that you are working on a feature that would make it way more practical to resolve them. Keep up the work!

Reply to "WMDE additional edit conflict resolution idea"

The new Edit Conflict software appears to mishandle page info passed to template logic

2
Summary by Alsee

Patched, reviewed, and merged in just a few hours. Nice work @Thiemo Kreuz (WMDE). Thanx. The fix will presumably be deployed soon.

Alsee (talkcontribs)
  • I encountered an edit conflict at English Wikipedia:Village_pump_(policy), with the beta edit conflict software enabled.
  • The page included several copies of the the Talk Quote template, {{tq}}. This template includes logic to verify the namespace of the current page. This template generates a red error message when it detects that it is being used on an inappropriate page. The template normally detects and accepts Village Pump as an appropriate page.
  • The {{tq}} template failed to render correctly in the new edit conflict preview. The template generated warning messages that it was being used on an inappropriate page.
  • I saved the edit. The template and everything else rendered correctly on the saved page.

I believe the most likely explanation is that the edit conflict software passed incorrect information about the page to the template logic. I only encountered this issue once, I was in the middle of clicking save when I spotted the problem, and I have not attempted any testing. My interpretation and explanation of the issue seem obvious and simple, but it is merely a hasty hypothesis.

Thiemo Kreuz (WMDE) (talkcontribs)

That is indeed exactly what happens. Thanks a lot for the wonderful report (especially for clearly marking hypothesis as such) and for creating that Phabricator ticket. This will be fixed.

Add button to select all instances of your version

1
Summary by Thiemo Kreuz (WMDE)
SUM1 (talkcontribs)

Very frustrating when one tiny edit in one paragraph disrupts an edit you've made that affects 20 other paragraphs and you have to manually click through 19 of them selecting "your version".

Simple feature request. Thank you.

Reply to "Add button to select all instances of your version"
RoySmith (talkcontribs)

I've started using this. I'm generally finding it much nicer than the previous way. It would be even more convenient if each of the side-by-side text boxes had a "copy this text to the clipboard" button. It would save having to manually select the text, then copy it. ~~~~

Reply to "Add a "copy text" button?"