You probably know that, but worth mentioning, now that the code base is very similar in both branches, we can do bulk cherry-picks... git cherry-pick -x initialCommit..finalCommit ... this gets harder to do when the code base differs or not all commits should be cherry-picked (i.e., after we final community).
Edson On Fri, Jul 26, 2013 at 3:21 AM, Salaboy <sala...@gmail.com> wrote: > Yeah I will wait for mikes cherry picks > > Sent from my iPhone > > On 26 Jul 2013, at 08:03, Michael Anstis <michael.ans...@gmail.com> wrote: > > I've got a ton of cherry picks to do for guvnor, kie-wb-common and > drools-wb plus a couple for droolsjbpm-build-bootstrap and > kie-wb-distributions. > > I'm on PTO until Monday, so it might be worth holding off on cherry > picking to the first three until I've cherry picked first to minimize > conflicts. > > Sent on the move > On 25 Jul 2013 22:01, "Edson Tirelli" <ed.tire...@gmail.com> wrote: > >> >> All, >> >> As you probably know, 6.0.0.CR1 was tagged yesterday and the >> corresponding branch (6.0.x) was created last Tuesday. >> >> As a reminder, since the creation of the branch and until we release >> 6.0.0.Final: >> >> (1) please cherry-pick all commits you make for master into the 6.0.x >> branch. Do not wait to cherry-pick, because this might end up creating >> conflicts if commits are cherry-picked out of order. Also don't forget to >> cherry-pick. >> >> (2) if there is a BZ and/or JIRA for your work (there should be), add the >> BZ/JIRA numbers to your commit message >> >> (3) add the link to your commit as a comment on the corresponding BZ >> >> Item (3) above is temporary until they fix the BZ/GitHub integration, >> but important. >> >> After we release 6.0.0.Final, you should only cherry-pick commits into >> 6.0.x branch if they have a corresponding BZ and the 3 acks set. >> >> Let us know if you have any questions. >> >> Thanks, >> Edson >> >> -- >> Edson Tirelli >> Principal Software Engineer >> Red Hat Business Systems and Intelligence Group >> >> >> _______________________________________________ >> rules-dev mailing list >> rules-dev@lists.jboss.org >> https://lists.jboss.org/mailman/listinfo/rules-dev >> > _______________________________________________ > jbpm-dev mailing list > jbpm-...@lists.jboss.org > https://lists.jboss.org/mailman/listinfo/jbpm-dev > > > _______________________________________________ > rules-dev mailing list > rules-dev@lists.jboss.org > https://lists.jboss.org/mailman/listinfo/rules-dev > -- Edson Tirelli Principal Software Engineer Red Hat Business Systems and Intelligence Group
_______________________________________________ rules-dev mailing list rules-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/rules-dev
