Daniel, the workflow is essentially what I follow as a committer. I never push straight to the master on the official Apache repo. GitHub offers me a few distinct advantages:
1. Automated PR builds. I could run the PR build locally but then that ties up my machine when I could be working on something else. 2. Chance for discussion *before* the commit is made on the official Apache repo. If there's something wrong with the PR then you want to catch it before it's committed, not after. 3. Allows someone other than the developer who made the changes to merge the commit. This is a rule we follow pretty closely and it should probably be specifically outlined in the hacking guide. BTW, here's some notes specifically for project maintainers: https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/maintainers.md Justin ----- Original Message ----- From: "Daniel Kulp" <[email protected]> To: [email protected] Sent: Monday, June 8, 2015 8:41:56 AM Subject: Re: Git workflow for committers > On Jun 8, 2015, at 9:35 AM, Justin Bertram <[email protected]> wrote: > > We recently published a Hacking Guide that outlines the typical development > cycle: > https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/code.md#typical-development-cycle > > Improvements are certainly welcome. I think this is ok for workflow for non-committers. Nice to have that documented. Committers should not have to go through github. In particular: step 4 can just be push your branch to a new branch at Apache. There isn’t a need for github for that Step 5: if you push to Apache in step 4, all the commits would be on the Apache commits list and would be fine for discussion from there. Step 7: if you are a committer, just push it to master. There is no need for the pull requests from github. Dan > > > Justin > > P.S. I already sent a PR to get the references to the old JIRA repo (i.e. > ACTIVEMQ6) updated to the new one (i.e. ARTEMIS). > > ----- Original Message ----- > From: "Bruce Snyder" <[email protected]> > To: [email protected] > Sent: Sunday, June 7, 2015 2:10:14 PM > Subject: Git workflow for committers > > New committer Marc Schöchlin has raised some questions about the git > workflow to use as he continues to work on the init scripts. This is a > perfect opportunity for all committers to discuss the workflow that we > recommend be used when working on ActiveMQ projects and I will document the > end result on the wiki in association with the 'How To Become a > Committer...' page. > > After many years of experience with git, I am a big fan of git flow ( > http://nvie.com/posts/a-successful-git-branching-model/) but I don't > believe that is being used on ActiveMQ. So what is the general git workflow > that committers use today? > > Bruce > > -- > perl -e 'print > unpack("u30","D0G)U8V4\@4VYY9&5R\"F)R=6-E+G-N>61E<D\!G;6%I;\"YC;VT*" );' > > ActiveMQ in Action: http://bit.ly/2je6cQ > Blog: http://bruceblog.org/ > Twitter: http://twitter.com/brucesnyder -- Daniel Kulp [email protected] - http://dankulp.com/blog Talend Community Coder - http://coders.talend.com
