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.
Version: 1.25-git
Severity: enhancement
See Also:
https://bugzilla.wikimedia.org/show_bug.cgi?id=22783