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>*™*
