Re: Should we dev on master then backport, or the other way?

On Fri, 26 Sep 2014, Ferenc Kovacs wrote: > On Fri, Sep 26, 2014 at 1:29 PM, Florian Margaine <florian@margaine.com> > wrote: > > > The question is in the title :-) > > > > As far as I know, most projects follow this convention: develop on > > the master branch, then backport the fixes/features to older > > versions. > > > > I had a discussion with another core dev who told me he did the > > opposite: develop on PHP-5.5, then move the fix/feature up to the > > new branches (first PHP-5.6, then master). > > > > Is there a convention for php-src? Or is it "whatever the dev > > wants"? > > see https://wiki.php.net/vcs/gitworkflow if a change affects > multiple > branch we commit it to the lowest possible branch and merge it > upwards. there were a recent discussion about whether or not to change > this, as the current master (aka PHP7) has major changes which makes > the merge everything up strategy a lot more painful, but this > discussion didn't reached a consensus so there are no change in the > old workflow. But we really should fix this, as merging up is no fun right now. cheers, Derick