#96 Disable smart conflict merging within source files?

[Lee Worden]

This came from a conversation with Sherwin Gooch.

Mediawiki does "smart" conflict merging: if you save changes to a page, but someone else has changed it since you started editing, it merges the changes together silently if possible, for instance if you've edited different parts of the page. If it can't see how to do that, like because you both changed the same part, it asks you to resolve the conflict before saving.

The smart merging seems better for wiki pages than for source files - it may be convenient sometimes (like if the page is one big .tex file and people work on different sections) but could also introduce awful bugs in code that could be diabolically hard to track down. Maybe it shouldn't be allowed to do the smart conflict merging within a single source file.

[Jonathan Dushoff]

It doesn't seem that scary to me, because of the wiki history feature. Should we wait and see if any complaints are received?

[Lee Worden]

Either that or I get around to looking closer at the issue, which isn't likely to happen too soon.