On Thu, Mar 6, 2014 at 4:08 PM, Erik Bernhardson <ebernhard...@wikimedia.org > wrote: > > Does core have any policies related to merging? The core features team > has adopted a methodology(although slightly different) that we learned of > from the VE team. Essentially +2 for 24 hours before a deployment branch > is cut is limited to fixes for bugs that were introduced since the last > deployment branch was cut or reverts for patches that turned out to not be > ready for deployment. Core is certainly bigger and with more participants, > but perhaps a conversation about when to +2 and how that effects the > deployment process would be benefitial? > > Formally, no (not that I know of). Informally, I know a lot of us do a lot of merging on Fridays, partly for this reason. I resisted merging a big patch this morning because I want it to sit in beta for a while. I know a few patches were merged this morning so that they *would* make it into today's deploy. Everyone with +2 should always think about how/when things will be deployed, and merge as appropriate. And it seems like most people use good judgement most of the time.
If this is coming up a lot, then yeah, let's make some policy about it, or just enforce it in how we do the branch cutting. _______________________________________________ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
