At the moment it must be called 'hotfix/*' or 'bugfix/*'. we should add 'feature/*' to that.
On Fri, Oct 24, 2014 at 11:11 PM, Mike Tutkowski <mike.tutkow...@solidfire.com> wrote: > Cool...so, it sounds like any branch we create in the repo will > automatically have CI run against it post each commit. > > How do you know when CI has completed and what the results are? > > At that point, you could treat your own branch (as Daan says) as the > "forward" branch. Once CI has been successful, you can merge your code to, > say, 4.5 (or the RM can). > > We then need a protocol for when we merge to 4.5 from our own branch, but > don't want to have those changes in master. > > If we do want those changes, of course we can just merge from 4.5 to master. > > On Fri, Oct 24, 2014 at 2:45 PM, Daan Hoogland <daan.hoogl...@gmail.com> > wrote: > >> We do run ci on branches! >> >> mobile dev with bilingual spelling checker used (read at your own risk) >> Op 24 okt. 2014 20:38 schreef "Mike Tutkowski" < >> mike.tutkow...@solidfire.com >> >: >> >> > Right, we just need to make sure CI comes into play before the merge. >> > >> > Hence my earlier reply to what Daan mention: >> > >> > "My main concern was CI running before the code was checked into the >> "real" >> > branch from the staging branch." >> > >> > On Fri, Oct 24, 2014 at 12:28 PM, David Nalley <da...@gnsa.us> wrote: >> > >> > > On Fri, Oct 24, 2014 at 3:12 AM, Daan Hoogland < >> daan.hoogl...@gmail.com> >> > > wrote: >> > > > Mike, Why have everybody work on the same branch. people can work on >> > > > their own branch and when they are done they can rebase on the tip >> see >> > > > ci success and then merge. The problem with forward branches is >> > > > abandoned work or work that for some reason shouldn't go in 'this' >> > > > release. it will remain there. >> > > > >> > > >> > > CI really needs to happen before the merge occurs, IMO. Backing out >> > > merges, in my experience, is incredibly painful. And typically this >> > > means that someone else is going to have to clean up the mess after >> > > someone merges. >> > > >> > >> > >> > >> > -- >> > *Mike Tutkowski* >> > *Senior CloudStack Developer, SolidFire Inc.* >> > e: mike.tutkow...@solidfire.com >> > o: 303.746.7302 >> > Advancing the way the world uses the cloud >> > <http://solidfire.com/solution/overview/?video=play>*™* >> > >> > > > > -- > *Mike Tutkowski* > *Senior CloudStack Developer, SolidFire Inc.* > e: mike.tutkow...@solidfire.com > o: 303.746.7302 > Advancing the way the world uses the cloud > <http://solidfire.com/solution/overview/?video=play>*™* -- Daan
