Kris Craig <kris.cr...@gmail.com> writes: > Thanks for the update! > > Quick question: As far as the branching model goes, are we going to stick > with the SVN-style of just having a branch for each release version and > dumping all the commits directly onto it, or do you plan on switching to a > more modern Git-style branching model of merging feature sub-branches into > the parent version branches? Or has this issue not been discussed yet? > > --Kris > > > On Sat, Mar 3, 2012 at 1:58 PM, David Soria Parra <d...@php.net> wrote: >
The "idiomatic" way to do this would be to have releases done as tags off of the master branch. Other than that, it makes a lot of sense to have a branch for major features / versions, and for people to develop specific features in their own branch, to rebase changes coming from parent branches onto working branches, and then to merge those into their respective parent branches after they're done. I swear that sounds much more complicated than it is. I personally think that php as a whole would *greatly* benefit from adopting this sort of development model -- it's likely that git-savvy new contributors will anyhow, and it makes accepting contributions a hell of a lot less painful. -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
