On Thursday, March 20, 2014 9:44:11 AM UTC-7, Jeremy Rossi wrote: > > >> # Code management of bug fixes ############################# > >> > >> During alpha, beta, and RC I propose that we make sure that all fixes > go > >> into master then are cherry picked from master to the release repo. > This > >> will make sure that all changes are always in master and make sure that > >> the repos don't become divergent. > > work in master then back port. This is how a lot do it nowa days: > *bsd, linux kernel, redhat, etc. The reason is pulling a fix forward in > time is harder to do and you take a chance of have to repeat fixes if > you don't pull them forward to master quicklty . > > pull request -> > (ossec/ossec-hids#master) -> > cherry-pick -> > (ossec/ossec-hids-2.8#master) > > This sounds good. Let's go with this model.
-- --- You received this message because you are subscribed to the Google Groups "ossec-list" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
