On Fri, Mar 23, 2012 at 1:11 PM, Rob Lanphier robla@wikimedia.org wrote:
On Fri, Mar 23, 2012 at 10:03 AM, Chad innocentkiller@gmail.com wrote:
I disagree here. The wmf branches should always be linear, and you should never merge to it without accepting that it may get scapped.
Actually, you should never merge to master without accepting that it may get scapped. Why have two layers here?
Well true, but I still don't see an instance where you'd merge to master but *not* be willing to have it deployed.
-Chad