[Bug 73667] New: Special-case edit conflicts where content is added to the end of a section and a new following section is inserted

[b***@wikimedia.org]

https://bugzilla.wikimedia.org/show_bug.cgi?id=73667

Bug ID: 73667
Summary: Special-case edit conflicts where content is added to
the end of a section and a new following section is
inserted
Product: MediaWiki
Version: 1.25-git
Hardware: All
OS: All
Status: NEW
Severity: enhancement
Priority: Unprioritized
Component: Page editing
Assignee: wikibugs-***@lists.wikimedia.org
Reporter: ***@wikimedia.org
CC: ***@wikimedia.org
Web browser: ---
Mobile Platform: ---

From tgr on wikitech-l:

| Another low-hanging fruit would be to special-case the situation when
| editor A adds text to the end of a section but does not start a new
| section, while editor B adds a new section to the same place. This is
| currently a conflict as they both try to insert to the same "slot" between
| paragraphs, so a generic merge tool cannot figure out whether those
| additions conflict and what would be the right order if they don't;
| however, knowing the semantics of wikitext, inserting the text from A first
| and the one from B after that seems a pretty safe bet. This kind of
| conflict is very typical on talk pages where people almost always edit the
| end of a section, and the few "hot topic" sections get the majority of the
| edits.

Seems sensible.

[b***@wikimedia.org]

https://bugzilla.wikimedia.org/show_bug.cgi?id=73667

James Forrester <***@wikimedia.org> changed:

What |Removed |Added
----------------------------------------------------------------------------
Priority|Unprioritized |Normal

[b***@wikimedia.org]

https://bugzilla.wikimedia.org/show_bug.cgi?id=73667

Umherirrender <***@web.de> changed:

What |Removed |Added
----------------------------------------------------------------------------
CC| |***@web.de

--- Comment #1 from Umherirrender <***@web.de> ---
Sounds a bit like bug 22783

[b***@wikimedia.org]

https://bugzilla.wikimedia.org/show_bug.cgi?id=73667

--- Comment #2 from James Forrester <***@wikimedia.org> ---
(In reply to Umherirrender from comment #1)

Post by b***@wikimedia.org
Sounds a bit like bug 22783

Yes, but this would occur for non-terminal sections too, I think?

[b***@wikimedia.org]

https://bugzilla.wikimedia.org/show_bug.cgi?id=73667

James Forrester <***@wikimedia.org> changed:

What |Removed |Added
----------------------------------------------------------------------------
See Also| |https://bugzilla.wikimedia.
| |org/show_bug.cgi?id=22783