I've created a 6x branch from master, now I am going through the pain of trying to reconcile all the conflicts between current master and 7 branch before pushing the merge to master. I'll let you know how it goes later this week.
Regards, Tommaso Il giorno lun 25 set 2017 alle ore 14:13 Tommaso Teofili < tommaso.teof...@gmail.com> ha scritto: > Il giorno gio 21 set 2017 alle ore 06:34 lewis john mcgibbney < > lewi...@apache.org> ha scritto: > >> Hi Tommaso, >> >> I'm +1 to this. From my previous thread on the topic as well [0] I've seen >> nothing which did not support making 7.X as master. >> Do you want to go ahead and do this Tommaso? Also, do you want to take a >> merging JOSHUA-209 into the new master? >> > > sure, I'll do that later this week. > > >> After that is done, we can go ahead and clean up the branches and to then >> look at the Git workflow as others suggested. >> > > +1 > > Tommaso > > >> Lewis >> >> [0] >> >> https://lists.apache.org/thread.html/67e5cdde9c9652ec98bca2705cb1c4bdd253ec9c0966e9b3064c47d8@%3Cdev.joshua.apache.org%3E >> >> On Wed, Sep 20, 2017 at 2:50 AM, < >> dev-digest-h...@joshua.incubator.apache.org> wrote: >> >> > >> > From: Tommaso Teofili <tommaso.teof...@gmail.com> >> > To: "dev@joshua.incubator.apache.org" <dev@joshua.incubator.apache.org> >> > Cc: >> > Bcc: >> > Date: Wed, 20 Sep 2017 09:50:29 +0000 >> > Subject: merging 7 branch to master >> > hi all, >> > >> > how about : >> > - moving the master branch into a 6.x branch >> > - merging 7 branch into master >> > >> > This way we can support 6.1 with bugfixes and minor releases and go >> ahead >> > with development on version 7. >> > >> > Regards, >> > Tommaso >> > >> > >> >> >> -- >> http://home.apache.org/~lewismc/ >> @hectorMcSpector >> http://www.linkedin.com/in/lmcgibbney >> >
