spot-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Austin Leahy <Aus...@digitalminion.com>
Subject Re: Merging PRs
Date Fri, 28 Apr 2017 20:42:40 GMT
Will do
On Fri, Apr 28, 2017 at 1:25 PM Michael Ridley <mridley@cloudera.com> wrote:

> I was confused about this as well.  I don't have much ASF experience so I
> was deferring to the wisdom of others and not commenting, but I thought ASF
> git repo was authoritative and github was a convenience mirror.  I've never
> worked with a project that even used github PRs so this is new for me -
> I've always seen git patch files attached to ASF JIRAs.
>
> Michael
>
> On Fri, Apr 28, 2017 at 4:18 PM, Mark Grover <mark@apache.org> wrote:
>
> > Thanks Austin,
> > If you could please put this in a wiki page (sorry if you have already
> and
> > I haven't noticed), that'd be great.
> >
> > Also, about the merging part. The PR says merged
> > <https://github.com/apache/incubator-spot/pull/40> and that happened
> over
> > 2
> > hours ago. Our single source of truth code repo is the ASF git repo (
> > https://git1-us-west.apache.org/repos/asf?p=incubator-spot.git) -
> > github.com/apache/incubator-spot is just a clone.
> >
> > And, the ASF git repo doesn't seem to have that change. The (albeit,
> > undocumented) practice based on what I know is to use github PRs for
> > reviewing, but the final push has to be to the ASF git repo, not to the
> > github.com/apache/incubator-spot
> >
> > On Fri, Apr 28, 2017 at 12:21 PM, Austin Leahy <Austin@digitalminion.com
> >
> > wrote:
> >
> > > Happy Friday everybody!
> > >
> > > I just merged my first PR since we switched from ONI to Spot and I
> > learned
> > > several things about the way that asf works.
> > >
> > > TL;DR: Bookmark this email for when you get confused about why your PR
> > > hasn't merged.
> > >
> > > As a result I wanted to share what I learned with our contributors who
> > may
> > > not be familiar with how the foundation's github repos work.
> > >
> > > Committers have PR rights but not write access to any particular branch
> > in
> > > the repo. The best way to submit PRs is to use the Forking git-flow
> > > workflow.
> > >
> > > https://www.atlassian.com/git/tutorials/comparing-workflows#
> > > forking-workflow
> > > (one of the better explanations of how this works)
> > >
> > > The ASF runs its repository operations with bots in order to merge a PR
> > > several things need to happen
> > >
> > >    - PRs need to Be tied to a ticket in the SPOT jira instance
> > >
> > > https://issues.apache.org/jira/browse/SPOT/
> > >
> > > The bot looked at my PR when I added added a reference to the Jira
> ticket
> > > in my PR;
> > > "resolves SPOT-143"
> > >
> > >    - PR needs members to review the PR
> > >
> > > everyone on the list has been really great with +1's and comments for
> > > ongoing discussions. However to actually trigger merges we need people
> to
> > > use github's review feature to approve the PR. *The review button
> appears
> > > when you look at the diff for the PR.*
> > >
> > > Once those things happened the merge happened quickly and the changes
> > went
> > > live to the website almost instantly.
> > >
> > > Hopefully this can help us get moving on some of our lingering minor
> PRs
> > > e.g.
> > > https://github.com/apache/incubator-spot/pull/21
> > >
> > > Here is a more advanced version of this discussion from the zookeeper
> > wiki
> > >
> > > https://cwiki.apache.org/confluence/display/ZOOKEEPER/
> > > Merging+Github+Pull+Requests
> > >
> > > Thanks Austin
> > >
> >
>
>
>
> --
> Michael Ridley <mridley@cloudera.com>
> office: (650) 352-1337
> mobile: (571) 438-2420
> Senior Solutions Architect
> Cloudera, Inc.
>

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