On the second edit conflict, I read the message at the page top. It says: Someone else has changed this page since you started editing it. The upper text area contains the page text as it currently exists. **Your changes are shown in the lower text area.** You will have to merge your changes into the existing text. Only the text in the upper text area will be saved when you press "Save page".
Emphasis added by me. We all know that people fail to read though. If we can come up with a more colorful error message or a more intuitive edit conflict page layout, I'm all ears. As to (semi-automatic) conflict resolution, our diff viewer probably has to be fixed first - any conflict resolution starts with identifying the differences, and our diff viewer fucks up at smallest possible edits or problems as soon as an extra line break is involved, i.e. https://test.wikipedia.org/w/index.php?title=User%3AGryllida&action=historysubmit&diff=218760&oldid=218759 (Were the first sentence edit and second sentence edits made separately, and with a conflict, the logic would die (esp. with an extra line break change involved inbetween)). On Mon, 17 Nov 2014, at 09:36, Pine W wrote: > Svetlana: having accidentally tested this "feature" again, yes. I was > looking in the wrong place for my text, and I copied the wrong portion of > text in my haste to save it. The text is now permanently gone. Judging by > the number of times that I hear about edit conflicts, I have plenty of > company with encountering this scenario. > > James: would it be possible to automatically save the text of a page to a > user's sandbox when they encounter an edit conflict? This would overwrite > the content of the sandbox, but that could be reverted using the normal > history page for the sandbox. > > > > Pine > > *This is an Encyclopedia* <https://www.wikipedia.org/> > > > > > > > *One gateway to the wide garden of knowledge, where lies The deep rock of > our past, in which we must delve The well of our future,The clear water we > must leave untainted for those who come after us,The fertile earth, in > which truth may grow in bright places, tended by many hands,And the broad > fall of sunshine, warming our first steps toward knowing how much we do not > know.* > > *—Catherine Munro* > > On Sun, Nov 16, 2014 at 2:10 PM, svetlana <svetl...@fastmail.com.au> wrote: > > > Doesn't edit conflict show your content at the bottom of the edit conflict > > page? A bit unintuitive, but should be there. > > > > On Mon, 17 Nov 2014, at 09:07, Pine W wrote: > > > I have just lost *two hours* of work due to an edit conflict. I thought > > > using my browser's back button would fix it, but the text is gone > > forever. > > > Argh. > > > > _______________________________________________ > > Wikitech-l mailing list > > Wikitech-l@lists.wikimedia.org > > https://lists.wikimedia.org/mailman/listinfo/wikitech-l > > > _______________________________________________ > Wikitech-l mailing list > Wikitech-l@lists.wikimedia.org > https://lists.wikimedia.org/mailman/listinfo/wikitech-l _______________________________________________ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
