Last modified: 2014-11-20 19:27:58 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T75667, the corresponding Phabricator task for complete and up-to-date bug report information.
Bug 73667 - Special-case edit conflicts where content is added to the end of a section and a new following section is inserted
Special-case edit conflicts where content is added to the end of a section an...
Status: NEW
Product: MediaWiki
Classification: Unclassified
Page editing (Other open bugs)
1.25-git
All All
: Normal enhancement (vote)
: ---
Assigned To: Nobody - You can work on this!
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2014-11-20 18:59 UTC by James Forrester
Modified: 2014-11-20 19:27 UTC (History)
2 users (show)

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---


Attachments

Description James Forrester 2014-11-20 18:59:04 UTC
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.
Comment 1 Umherirrender 2014-11-20 19:07:12 UTC
Sounds a bit like bug 22783
Comment 2 James Forrester 2014-11-20 19:27:52 UTC
(In reply to Umherirrender from comment #1)
> Sounds a bit like bug 22783

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

Note You need to log in before you can comment on or make changes to this bug.


Navigation
Links