cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Max Woghiren <m...@google.com>
Subject Re: New doc with new git workflows
Date Tue, 12 Mar 2013 18:41:22 GMT
On Tue, Mar 12, 2013 at 2:31 PM, Braden Shepherdson <braden@chromium.org>wrote:

> Comments inline
>
> On Tue, Mar 12, 2013 at 10:08 AM, Ian Clelland <iclelland@google.com>
> wrote:
>
> > I don't see any techincal problems with the doc -- the commands all look
> > good to me. Just a couple of comments about the flow:
> >
> > The very start of the doc talks about working on a feature branch, with
> no
> > mention on how that is created. Unless that's considered trivial, and
> > everyone is already very comfortable with branching, then I would add a
> > note about starting a feature branch off of master (just a 'checkout
> master
> > / pull origin master / checkout -b myfeature', really.)
> >
>
> I think this is pretty basic git and not specific to Cordova or this flow.
> It could be added if we want more hand-holding.
>

Just for completeness, I'd say add it if it's not too much extra work.
 Alternatively, linking to a relevant page at git-scm.com would work too.


> >
> > The example that you give for using 'squash' is a situation where I would
> > always recommend 'fixup' instead: one large commit with the correct
> commit
> > message, followed by a sequence of small changes to it. (Although I
> almost
> > never use squash, so maybe it's just me)
> >
>
> I deliberately didn't mention fixup, though I know and use it myself. I
> opted to keep it simple rather than to show all the features. I can add it
> as an aside, though.


Similarly, I lean towards mentioning this, even if just as an aside as you
suggested.


>  >
> > Also, should there eventually be a guide for the release managers on
> > tagging and branching?
> >
> >
> There are already guides for this on the wiki, which might be combined into
> this doc and definitely need updating to this flow.
>
>
> Braden
>
>
> > Ian
> >
> >
> > On Mon, Mar 11, 2013 at 7:35 PM, Braden Shepherdson <braden@chromium.org
> > >wrote:
> >
> > > I wrote up the new git workflows into a doc intended for inclusion in
> the
> > > Cordova Documentation (it provides much nicer formatting than the
> wiki).
> > > You can check it out here:
> > >
> > >
> > >
> >
> https://googledrive.com/host/0B8sLcyOAEX-XUHAxNXhISE5rTTg/guide_contributing_index.md.html
> > >
> > > Please let me know if you spot any problems or have any questions. If
> > > people like the idea of a contributor entry in the Guide, I'll commit
> > this
> > > into edge.
> > >
> > > Braden
> > >
> >
>

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