On Wed Nov 19 2014 at 3:50:02 PM Nathan <[email protected]> wrote: > Why not just interleave or nest the conflicted edit in the history of the > page? So if you are editing revision 1, and conflict with someone elses > revision 2, save your revision as 2 and the next person's revision as 3? > There's some ugliness in the revision history to resolve (like timestamps), > and potentially other ways it could be done, but I see no reason not to > slot the conflicted edit into the history while prompting the user to merge > into a current revision. > > Except since rev_id auto-increments you'd end up with an out-of-place rev_id in the history. In your example you'd end up with something like:
[[Page]] history: - Latest rev by Joe (rev_id 2) - Previous rev by Jane (rev_id 3) <- This was the edit conflict, inserted after the fact - First rev by Jim (rev_id 1) <- This one was the one Jane and Joe both began editing from -Chad _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
