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.

Version: 1.23.0
Severity: major
See Also:
https://bugzilla.wikimedia.org/show_bug.cgi?id=56849