https://bugzilla.wikimedia.org/show_bug.cgi?id=28673
--- Comment #11 from Reedy <[email protected]> 2011-04-28 16:08:00 UTC --- Screw SVN, I give up with that branch before bringing it fully to head. Happy-melon and others have started some fairly large parser and what not changes... These seemed to be conflicting in some cases, but fixing them doesn't seem to have removed all the conflict markers, and I noticed on clearing up later commits they're still there. Might be easier to branch freshly, forward merge the changes (manually, or semi automagically), and then push out to trunk (even if it then gets reverted out for 1.18) -- 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
