On Sep 30, 2013, at 11:33 AM, Tomaž Cerar <tomaz.cerar(a)gmail.com> wrote:
On Mon, Sep 30, 2013 at 6:26 PM, Jason Greene <jason.greene(a)redhat.com> wrote:
Think of it as everyone submitting pull requests into master-ignore instead of master, we
just simply rename master-ignore to master-staging since they no longer ignore it. They
start their feature branch on master (always on master), but then they submit a PR into
master-staging, and then we click the green button if its good. If there is a conflict we
either send it back, submit a new pull on their behalf, or do the merge offline (that part
That would be bad, mostly because master-staging would/could get force pushes and if
people would rebase against it before sending PR it would cause great problems.
Thats why I said you always start a feature branch on master. No one would produce a
change on master-staging, only to master-staging.
Jason T. Greene
WildFly Lead / JBoss EAP Platform Architect
JBoss, a division of Red Hat