cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andrew Grieve <agri...@chromium.org>
Subject Re: 3.0.0 -> master merge
Date Fri, 28 Jun 2013 01:06:23 GMT
Steve - are you breaking the "never rebase remote branches rule" here?
Since 3.0.0 is remote and others have it checked out, it should not be
force pushed. I think merge is the way to go here without any rebasing.


On Wed, Jun 26, 2013 at 10:39 PM, Steven Gill <stevengill97@gmail.com>wrote:

> I have been keeping 3.0 branches fairly up to date by rebasing master into
> 3.0. All of the 3.0 branches need one final rebase from master before we
> merge them into master. The rebase is always a little messy due to the many
> `updating cordovajs` commits we have added as we have been testing.
>
> I will see if I get some time tomorrow morning to update the 3.0.0 branches
> before I head off to nodeconf.
>
>
> On Wed, Jun 26, 2013 at 7:36 PM, Filip Maj <fil@adobe.com> wrote:
>
> > Good call on the master -> 2.9.0 merge. Not sure if we need to do a 2.9.1
> > right away.. Maybe if/when it becomes an issue?
> >
> > On 6/26/13 7:29 PM, "Andrew Grieve" <agrieve@chromium.org> wrote:
> >
> > >+1!
> > >
> > >I think we should first merge master into 2.9.x. I know there is at
> least
> > >one bugfix for Android that is on master and not 2.9.x. That will ensure
> > >2.9.x is "the pre-plugin-split master".
> > >
> > >I think a merge makes sense in this case (as opposed to a rebase).
> > >
> > >
> > >On Wed, Jun 26, 2013 at 10:22 PM, Filip Maj <fil@adobe.com> wrote:
> > >
> > >> With 2.9.x branched and 2.9.0 out the door, may I suggest doing the
> move
> > >> over to 3.0.0 by merging/rebasing that branch into master?
> > >>
> > >> Would love for all committers to finally be able to iterate on cordova
> > >> with an exclusively plugin workflow using the cli or plugman :)
> > >>
> > >>
> >
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message