Re: Branching PHP6

On 05 Apr 2014, at 10:00, Stas Malyshev <smalyshev@sugarcrm.com> wrote: > makes it a nightmare to read. Furthermore, there's simply no need to have >> an ever-increasing number of dead branches that lead nowhere and never >> merge back. If somebody wants to find a specific version, that's what tags > > Branches are dirt-cheap in git, so dead branches is not a problem. Also, > the only dead branches are supposed to be release branches and very > rarely feature branches, all the rest should be done in private branches > and submitted as pull request. The usual git workflow which I’ve seen in the wild is: 1. release branch is created 2. release-specific commits are added 3. tag (optionally signed) is created 4. branch is removed In case development has to be restarted (for hotfix-patch), new branch is created from the tag-point. The advantage is, that “branches” represent points of active development and tags represent history. Advantage is purely semantical, of course -- Alexey Zakhlestin CTO at Grids.by/you https://github.com/indeyets PGP key: http://indeyets.ru/alexey.zakhlestin.pgp.asc

Attachment: [application/pgp-signature] Message signed with OpenPGP using GPGMail signature.asc