You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@isis.apache.org by Dan Haywood <da...@haywood-associates.co.uk> on 2014/09/15 21:34:30 UTC

Re: [isis] fixed broken link (#1)

Folks,

Per the email train below, Jeroen noticed I merged in a PR from github (a
tiny one line fix to a README, but a PR nevertheless) and wanted to check
that it was ok to do so.

Anyway, just to confirm, it IS ok to merge in PRs, but do see [1] for more
info on what the great and the good at ASF have to say on the matter.

Cheers
Dan

[1] https://issues.apache.org/jira/browse/LEGAL-156


~~~~~~~~

On 12 September 2014 14:03, Dan Haywood <da...@haywood-associates.co.uk>
wrote:

> No, I did that.  I set up a remote to his fork, pulled down his commit,
> and merged it in.  That way github automatically closes the pull request.
>
> My understanding (I hope I'm right on this) is that there's an implicit
> ICLA for anyone raising a PR on an Apache project that they grant the
> rights to ASF for the change.
>
> But mostly just trying to keep things nice and clean...
>
>
> On 12 September 2014 14:00, Jeroen van der Wal <je...@stromboli.it>
> wrote:
>
>> Can a non-committer merge into Isis?!
>>
>> ---------- Forwarded message ----------
>> From: asfgit <no...@github.com>
>> Date: Fri, Sep 12, 2014 at 2:23 PM
>> Subject: Re: [isis] fixed broken link (#1)
>> To: apache/isis <is...@noreply.github.com>
>>
>>
>> Merged #1 <https://github.com/apache/isis/pull/1>.
>>
>> —
>> Reply to this email directly or view it on GitHub
>> <https://github.com/apache/isis/pull/1#event-164723150>.
>>
>>
>

Re: [isis] fixed broken link (#1)

Posted by Martin Grigorov <mg...@apache.org>.
On Tue, Sep 16, 2014 at 10:03 AM, Dan Haywood <da...@haywood-associates.co.uk>
wrote:

> Thanks for that, Martin, will incorporate into Isis' committers guidelines
> if that's ok with you.
>

Sure!


>
> (I use msysgit as a shell on Windows, so I'm sure it can be made to work.
>  Else, can always run it on a Linux VM).
>
> Cheers
> Dan
>
>
> On 16 September 2014 07:37, Martin Grigorov <mg...@apache.org> wrote:
>
> > Hi,
> >
> > On Mon, Sep 15, 2014 at 10:34 PM, Dan Haywood <
> > dan@haywood-associates.co.uk>
> > wrote:
> >
> > > Folks,
> > >
> > > Per the email train below, Jeroen noticed I merged in a PR from github
> (a
> > > tiny one line fix to a README, but a PR nevertheless) and wanted to
> check
> > > that it was ok to do so.
> > >
> > > Anyway, just to confirm, it IS ok to merge in PRs, but do see [1] for
> > more
> > > info on what the great and the good at ASF have to say on the matter.
> > >
> > > Cheers
> > > Dan
> > >
> > > [1] https://issues.apache.org/jira/browse/LEGAL-156
> > >
> > >
> > > ~~~~~~~~
> > >
> > > On 12 September 2014 14:03, Dan Haywood <da...@haywood-associates.co.uk>
> > > wrote:
> > >
> > > > No, I did that.  I set up a remote to his fork, pulled down his
> commit,
> > >
> >
> > I use https://github.com/martin-g/dotfiles/blob/master/bin/github-pr.sh
> to
> > automate this task.
> > It can be easily modified to work for Isis. But it is a Shell script so
> it
> > won't work as is on Windows.
> >
> >
> > > > and merged it in.  That way github automatically closes the pull
> > request.
> > > >
> > > > My understanding (I hope I'm right on this) is that there's an
> implicit
> > > > ICLA for anyone raising a PR on an Apache project that they grant the
> > > > rights to ASF for the change.
> > > >
> > > > But mostly just trying to keep things nice and clean...
> > > >
> > > >
> > > > On 12 September 2014 14:00, Jeroen van der Wal <je...@stromboli.it>
> > > > wrote:
> > > >
> > > >> Can a non-committer merge into Isis?!
> > > >>
> > > >> ---------- Forwarded message ----------
> > > >> From: asfgit <no...@github.com>
> > > >> Date: Fri, Sep 12, 2014 at 2:23 PM
> > > >> Subject: Re: [isis] fixed broken link (#1)
> > > >> To: apache/isis <is...@noreply.github.com>
> > > >>
> > > >>
> > > >> Merged #1 <https://github.com/apache/isis/pull/1>.
> > > >>
> > > >> —
> > > >> Reply to this email directly or view it on GitHub
> > > >> <https://github.com/apache/isis/pull/1#event-164723150>.
> > > >>
> > > >>
> > > >
> > >
> >
>

Re: [isis] fixed broken link (#1)

Posted by Dan Haywood <da...@haywood-associates.co.uk>.
Thanks for that, Martin, will incorporate into Isis' committers guidelines
if that's ok with you.

(I use msysgit as a shell on Windows, so I'm sure it can be made to work.
 Else, can always run it on a Linux VM).

Cheers
Dan


On 16 September 2014 07:37, Martin Grigorov <mg...@apache.org> wrote:

> Hi,
>
> On Mon, Sep 15, 2014 at 10:34 PM, Dan Haywood <
> dan@haywood-associates.co.uk>
> wrote:
>
> > Folks,
> >
> > Per the email train below, Jeroen noticed I merged in a PR from github (a
> > tiny one line fix to a README, but a PR nevertheless) and wanted to check
> > that it was ok to do so.
> >
> > Anyway, just to confirm, it IS ok to merge in PRs, but do see [1] for
> more
> > info on what the great and the good at ASF have to say on the matter.
> >
> > Cheers
> > Dan
> >
> > [1] https://issues.apache.org/jira/browse/LEGAL-156
> >
> >
> > ~~~~~~~~
> >
> > On 12 September 2014 14:03, Dan Haywood <da...@haywood-associates.co.uk>
> > wrote:
> >
> > > No, I did that.  I set up a remote to his fork, pulled down his commit,
> >
>
> I use https://github.com/martin-g/dotfiles/blob/master/bin/github-pr.sh to
> automate this task.
> It can be easily modified to work for Isis. But it is a Shell script so it
> won't work as is on Windows.
>
>
> > > and merged it in.  That way github automatically closes the pull
> request.
> > >
> > > My understanding (I hope I'm right on this) is that there's an implicit
> > > ICLA for anyone raising a PR on an Apache project that they grant the
> > > rights to ASF for the change.
> > >
> > > But mostly just trying to keep things nice and clean...
> > >
> > >
> > > On 12 September 2014 14:00, Jeroen van der Wal <je...@stromboli.it>
> > > wrote:
> > >
> > >> Can a non-committer merge into Isis?!
> > >>
> > >> ---------- Forwarded message ----------
> > >> From: asfgit <no...@github.com>
> > >> Date: Fri, Sep 12, 2014 at 2:23 PM
> > >> Subject: Re: [isis] fixed broken link (#1)
> > >> To: apache/isis <is...@noreply.github.com>
> > >>
> > >>
> > >> Merged #1 <https://github.com/apache/isis/pull/1>.
> > >>
> > >> —
> > >> Reply to this email directly or view it on GitHub
> > >> <https://github.com/apache/isis/pull/1#event-164723150>.
> > >>
> > >>
> > >
> >
>

Re: [isis] fixed broken link (#1)

Posted by Martin Grigorov <mg...@apache.org>.
Hi,

On Mon, Sep 15, 2014 at 10:34 PM, Dan Haywood <da...@haywood-associates.co.uk>
wrote:

> Folks,
>
> Per the email train below, Jeroen noticed I merged in a PR from github (a
> tiny one line fix to a README, but a PR nevertheless) and wanted to check
> that it was ok to do so.
>
> Anyway, just to confirm, it IS ok to merge in PRs, but do see [1] for more
> info on what the great and the good at ASF have to say on the matter.
>
> Cheers
> Dan
>
> [1] https://issues.apache.org/jira/browse/LEGAL-156
>
>
> ~~~~~~~~
>
> On 12 September 2014 14:03, Dan Haywood <da...@haywood-associates.co.uk>
> wrote:
>
> > No, I did that.  I set up a remote to his fork, pulled down his commit,
>

I use https://github.com/martin-g/dotfiles/blob/master/bin/github-pr.sh to
automate this task.
It can be easily modified to work for Isis. But it is a Shell script so it
won't work as is on Windows.


> > and merged it in.  That way github automatically closes the pull request.
> >
> > My understanding (I hope I'm right on this) is that there's an implicit
> > ICLA for anyone raising a PR on an Apache project that they grant the
> > rights to ASF for the change.
> >
> > But mostly just trying to keep things nice and clean...
> >
> >
> > On 12 September 2014 14:00, Jeroen van der Wal <je...@stromboli.it>
> > wrote:
> >
> >> Can a non-committer merge into Isis?!
> >>
> >> ---------- Forwarded message ----------
> >> From: asfgit <no...@github.com>
> >> Date: Fri, Sep 12, 2014 at 2:23 PM
> >> Subject: Re: [isis] fixed broken link (#1)
> >> To: apache/isis <is...@noreply.github.com>
> >>
> >>
> >> Merged #1 <https://github.com/apache/isis/pull/1>.
> >>
> >> —
> >> Reply to this email directly or view it on GitHub
> >> <https://github.com/apache/isis/pull/1#event-164723150>.
> >>
> >>
> >
>