Twice in a row, my edits to an active page have been rebased incorrectly, so that "show changes" would have me throw away more recent edits than mine. I am using section editing, source mode.
Description
Description
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Open | None | T72163 Edit conflicts (tracking) | |||
| Duplicate | None | T124963 Section editing has edit rebase errors all day long |
Event Timeline
Comment Actions
steps to reproduce:
- Open "edit source" for a section.
- Make some changes.
- Meanwhile, a second editor also edits and saves the article. Unknown if this is section or full-page editing.
- First editor clicks "show changes."
The rendered diff will include the inverse of the second editor's changes, which is incorrect. The first editor's change should have been transparently rebased onto the latest revision.
Comment Actions
Have you tried to save the page? Was the conflict resolved correctly? If this was just the "Preview changes" diff, this is a duplicate of T121185.
Comment Actions
@matmarex
Thank you for pointing out the older bug--no, I didn't try saving the page until I had resolved the apparent conflicts.