On Sat, Jun 01, 2013 at 12:48:13PM -0700, Brian Dolbec wrote: > I've updated my rewrite with the other changes to master since I did > started the rewrite branch. Some commits were just cherry-picked > across, some needed minor editing to suit.
In other projects I'm involved in, the preferred approach is to rebase the feature branch onto the current master. The problem with cherry picking master advances onto your feature branch is that anyone else with feature branches based on the current master will have to rebase *their* feature branches to keep up with your branch. If the person proposing the changes does the rebasing, that's only a single branch that has to be rebased, which scales better ;). Cheers, Trevor -- This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
signature.asc
Description: OpenPGP digital signature
