Last modified: 2013-12-07 17:47:07 UTC
Today I had a edit conflict on the german village pump. A user leaved a section. Than I started my edit will the same user changed something at his text. That gave me a edit conflict, but I was wonder about the diff, which was shown on that page. The diff only contains my added section. In my opinion that should merged automatically. After a look in the history, I have seen the edit of the user, but that new text was not shown in the textarea on the edit conflict page. When I would copy the added sentence from botton text area to top text area the edit from the other user will be lost. I have saved my sentence in the dashboard and go to village pump again, pressed edit at the section and paste my sentence and than saved. That works. Please avoid that the edit conflict page shows the old text. Thanks.
Any link(s) to things that can be seen and were not in memory only?
I have realized the wrong text before save, so there is no wrong revision. But another user had also the problem, see [1] My succesfully edit was [2], you can see that the edit before my edit was a change to the same section and that change was not part of the top textarea on the edit conflict page. [1]https://de.wikipedia.org/w/index.php?title=Wikipedia:Fragen_zur_Wikipedia&diff=prev&oldid=123820437 [2]https://de.wikipedia.org/w/index.php?title=Wikipedia:Fragen_zur_Wikipedia&diff=prev&oldid=124047092
After a second look at this, this is the same issue I reported as bug 42163 *** This bug has been marked as a duplicate of bug 42163 ***
