Comment 16 for bug 505847

>It just flags one version as a conflict but
stores it anyway.

According ISO9000 rules, the best way to do this (from a document control standpoint) is to check before doing any edits to see if anyone is currently editing it (in which case it is in read-only mode), and if so then give you the option to notify them that you'd like to make an edit (ideally vim automatically does the notify within the editor interface). When the preexisting editor confirms they are done then you get a notification that the wikipage is editable.

In fact, I think this would be much easier to implement, and it would eliminate the need to leave it up to whomever to decide what to do with the edit's in que (as if one person would have a greater right to that determination than another).

Is this method an inconvenience? I'd say it's LESS of an inconvenience than ending up with incompatible simultaneous edits that must be resolved before additional edits can be made.

It's also my preference for how to do it (admittedly, I know this means nothing to anyone else, but I thought I'd mention it).