https://bugzilla.wikimedia.org/show_bug.cgi?id=41352
--- Comment #3 from Aude <[email protected]> 2012-10-24 20:33:53 UTC --- here's a temporary fix that should resolve the problem: https://gerrit.wikimedia.org/r/#/c/29872/ the merge implementation in TextContentHandler is a buggy, and causing issues I think with wfMerge3() the temporary fix uses the pre-contenthandler version of the mergeChangesInto EditPage function where it attempts to resolve edit conflicts. This appears to work and fix the problem. The better solution, of course, is to fix the issue in the content handler but I want a quick fix now. -- Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
