On Thursday, 11 de November de 2010 22:08:52 Robin Burchell wrote: > This kind of a workflow, when done properly, also doesn't end up adding > that many merges to history. Granted, the largest team I've used this > with was about 15 people, but still, feature branches only tended to > merge mainline once every week or two, perhaps even less often.
That's a huge team by our standards :-)
Our largest projects are no more than 4 or 5 people.
> For *smaller* branches (a commit or two) a cherry-pick/rebase is a
> reasonable idea to avoid additional merges, but even then, that's really
> not mandatory, it's just something I personally do out of personal habit.
I'd say that merging is the exception and that exception must be agreed upon.
Normal development (small features and bug fixes) happen directly with patches.
Medium-sized features often get squashed to a few commits.
--
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
