+1 to Chris / Neil You shouldn't be developing in master, ideally
On Tue, 17 Apr 2018, 15:10 Christian Lenz, <christian.l...@gmx.net> wrote: > Master shouldn’t be that one, where the wild development is going on. > Master should be that one which is already live. > In General, what gitflow does. Wild development is going on on the dev > branch, for the next release. If whatever is finished, there is a release > branch. After that, it will merged into master and created a tag. > > If this is not possible, then an other solution is that develop stays > clean and always releasable. You only work on Feature branches. After the > Feature is finished and ready to go, it will merged into develop. Someday > you can create a release branch of develop. > > > Cheer > > Chris > > Von: Neil C Smith > Gesendet: Dienstag, 17. April 2018 14:53 > An: dev@netbeans.incubator.apache.org > Betreff: Re: Time to branch for the release candidate? > > On Tue, 17 Apr 2018 at 12:10 Jaroslav Tulach <jaroslav.tul...@gmail.com> > wrote: > > > Yeah, there are changes in the queue for the master branch that could be > > too destabilizing. To avoid something like that to negatively influence > the > > 9.0 release, I'd suggest to create a branch release/9.0 and put only the > > safe fixes ready for 9.0 there. The wild development would continue in > the > > master branch. > > > > +1 to branching and that. Longer term perhaps a more gitflow-like system > where PR's come into a develop branch too? > > A question, though - I assume this will branch off master now, not from > the beta tag? Given that in NetCAT we were testing the beta, I assume > there is nothing you'd consider "too destabilizing" between then and now? > > Best wishes, > > Neil > -- > Neil C Smith > Artist & Technologist > www.neilcsmith.net > > Praxis LIVE - hybrid visual IDE for creative coding - www.praxislive.org > >
