Em Quarta-feira, 10 de Novembro de 2010, às 14:55:58, Tor Arne Vestbø escreveu: > > - how are the merges (eg, 4.7 into master) done? IMO as now. The > > maintainer of a module will take care of doing resolve merge conflicts > > and push them either to the review system as normal review, or directly > > to the integration. > > I agree.
We have an automated tool that tries the merge and pushes in the changes. If
it fails to merge, a selected list of people are called upon to try and help.
If it causes regressions, which thankfully only happens rarely, then the same
thing: a group of people is tasked with fixing it.
--
Thiago Macieira - thiago.macieira (AT) nokia.com
Senior Product Manager - Nokia, Qt Development Frameworks
Sandakerveien 116, NO-0402 Oslo, Norway
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
