How frequent we can planning to merge from develop to master ? during release ?
Regards, Rayees -----Original Message----- From: Prachi Damle [mailto:prachi.da...@citrix.com] Sent: Tuesday, August 05, 2014 11:51 AM To: dev@cloudstack.apache.org Subject: RE: [VOTE] git workflow Sorry if this is already discussed, but few areas that are unclear to me with this process are: - does every fix, however minor it be(say a signle line), needs to be developed in a separate branch? And then we have to merge these individual branches to develop for every fix? - In that case will direct check-ins to 'develop' branch be not allowed? - If not, if CI fails on develop branch, how will one know what caused the failure? Was it some direct checkin Vs some feature/fix merged? Will we revert all the small feature/fixes that were merged to develop branch upto the CI baseline? If yes, wont the developers that did not cause the break get penalized unnecessary? - Lastly, why can't this process be implemented on master? Why are we introducing another branch for the same purposes which the master branch usually serves? I am -1 on this. We should not start implementing this until all processes are clear. Prachi -----Original Message----- From: Jessica Wang [mailto:jessica.w...@citrix.com] Sent: Tuesday, August 05, 2014 11:33 AM To: dev@cloudstack.apache.org Subject: RE: [VOTE] git workflow Exactly. This just shifts pain from one branch to another. I don't see any gains from this, either. I vote "-1". Jessica -----Original Message----- From: Min Chen [mailto:min.c...@citrix.com] Sent: Tuesday, August 05, 2014 11:27 AM To: dev@cloudstack.apache.org Subject: Re: [VOTE] git workflow Agree with Animesh. Didn't see any gains from this, we just shift pain from one branch to another, so vote -1. -min On 8/2/14 9:50 PM, "Animesh Chaturvedi" <animesh.chaturv...@citrix.com> wrote: >+0 > >While this protects master with only commits which are merges from >release branch and keeps it clean but the issues that we have shift to >develop branch. > > >> -----Original Message----- >> From: Rajani Karuturi [mailto:rajani.karut...@citrix.com] >> Sent: Thursday, July 31, 2014 3:28 AM >> To: dev >> Subject: [VOTE] git workflow >> >> Hi All, >> >> We had long discussions on the git flow. >> I tried to capture the summary of it @ >> http://markmail.org/message/j5z7dxjcqxfkfhpj >> This is updated on wiki @ >> https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git- >> ProposedGitflowbasedCheck-inProcess and is up for a vote: >> >> Can you share your opinion on the proposal? >> >> [ ] +1 approve >> [ ] +0 no opinion >> [ ] -1 disapprove (and reason why) >> >> >> Thanks, >> ~Rajani >> >> >
