https://bugzilla.wikimedia.org/show_bug.cgi?id=28720
--- Comment #1 from Brion Vibber <[email protected]> 2011-04-27 22:00:50 UTC --- IIRC we originally added this for the following (verrrrrry common at least back in '02-03) case: * user hits 'edit', makes some changes * user hits 'save' and is redirected to the view page * user remembers he/she wants to add something else, hits 'back' to return to the edit page * edit page comes back in its previous state, with all the user's changes but with the edit time marker that indicates you're still working from the previous revision * user makes some more changes * user hits 'save' If anything that was changed in the first edit is changed further in the second, it would be unable to resolve the two edits with diff3, and kick out an edit conflict warning. By suppressing the edit conflict, we let the edit just go right through; since you started with the same text we can consider that you've "merged" it yourself, basically. Now it may have changed somewhat in the meantime, but if we are to change how this is handled to make other cases work, we still want to handle this common case cleanly. -- Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
