-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 11/11/2010 08:44 PM, Thiago Macieira wrote: > ... C1---C2---C3---C4---C5---C6---C7---C8--+-X1 > \ \ \ / > \-F1---F2-+-M1---F3------+-M2-- > > I don't call this merge spamming, it is the proper way to do things. A long- > lived branch for feature development will have many more F and M commits.
+1. 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. 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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJM3FtkAAoJEL09WxvSn7p9jUoH+wfwh37qVh7l7FL2OxSyqM5u QQP8uHImH7BhuDJ/2ESCCcmfP90+BVlHV+ZYkSEH1VZ2omkHyvUh+U5AnTvoU2ze BPSrCxgHNET8WPSziuhPAMKpIha1d1uKseu2EVBtgi6PiuwMvGIndjU54hXB2t00 s+XKAmQEil5OdHC7MHn8lrkeJr7YagiuI1uYBRVaJ/2riGjAq1x0tuB8yAUCV7os AVIbOsAuKi6KTXH8jVyLTuaUfN9y/NZ1YT2gHoQn9BXdr+lFuCl/+xMbsV49wz3J sqewcLXpIvbcjZ13UoVNBFHjyjGZbhcbn9td4UVbg9hN8jp5bXfoZmV1Y328EsI= =46G2 -----END PGP SIGNATURE----- _______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
