Description
There is a concurreny issue that leads to a broken diff on conflict resolval.
Not only is this a sensible workflow of merging new changes into an old revision while keeping the old revision till the merge is finished, it is even a pattern that might happen when a page is modified by different users.
Steps to reproduce
- Go to an existing page.
Click edit (in a new window)
- Revert the page in the first window
- View preview in the other window
You see the conflict message. But: there are no merges nor the original text. --> Your changes are lost.
Details
This wiki.
Workaround
Discussion
I can't reproduce it. I followed the instructions, and I DO get a a conflict message with my text, nothing lost.
Plan
- Priority:
- Assigned to:
- Status: Looks like a Heisenbug. Closing for now ...