Re: Short guide "Working with Github pull requests"

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: Short guide "Working with Github pull requests"

mthmulders
So, just to make sure: the sync is two-way? What happens on Gitbox is
synced to Github and vice versa? I thought it was only from Gitbox to
Github, but never the other way around...

I do agree that Githubs UI is a bit more sophisticated for dealing with
merge requests. I vaguely recall an earlier discussion on this list
about the use of Githubs "Squash and merge" button. I thought the
outcome of that discussion was that we shouldn't use it, because the
author in the commit log would show as "Github", or something like that.

So then the conclusion is, we can use Github for accepting & merging
pull requests, but shouldn't use "Squash & merge"?

Maarten

On July 13th, 2020 at 20:28, Elliotte Rusty Harold wrote:

> Much work happens directly on Github and syncs the other direction to
> Gitbox. That workflow is likely more familiar to most developers these
> days, and the Github UI is significantly advanced beyond Gitbox.
>
> On Mon, Jul 13, 2020 at 2:20 PM Maarten Mulders <[hidden email]> wrote:
>>
>> Hi all,
>>
>> The other day I was working on a pull request offered through Github. I
>> couldn't find instructions on how to accept and incorporate it. Based on
>> my own experiences with submitting patches to Maven through Github I
>> came up with a short how-to.
>>
>> I have written it down in a short guide "Working with Github pull
>> requests" [1] which I intent to publish on the Apache Maven site, under
>> "Maven Developer Centre / Committers". I would appreciate if some of you
>> could take a look and see if the guide makes sense.
>>
>> Thanks,
>>
>> Maarten
>>
>> [1]
>> https://gitbox.apache.org/repos/asf?p=maven-site.git;a=shortlog;h=refs/heads/add-github-pull-request-guide
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Short guide "Working with Github pull requests"

Enrico Olivelli
Il Lun 13 Lug 2020, 21:03 Maarten Mulders <[hidden email]> ha
scritto:

> So, just to make sure: the sync is two-way?


Yes

What happens on Gitbox is
> synced to Github and vice versa? I thought it was only from Gitbox to
> Github, but never the other way around...
>

No. We should ask infra to know how this magic happens

>
> I do agree that Githubs UI is a bit more sophisticated for dealing with
> merge requests. I vaguely recall an earlier discussion on this list
> about the use of Githubs "Squash and merge" button. I thought the
> outcome of that discussion was that we shouldn't use it, because the
> author in the commit log would show as "Github", or something like that.
>
> So then the conclusion is, we can use Github for accepting & merging
> pull requests, but shouldn't use "Squash & merge"?
>

Yes, do not use the button

Enrico



> Maarten
>
> On July 13th, 2020 at 20:28, Elliotte Rusty Harold wrote:
> > Much work happens directly on Github and syncs the other direction to
> > Gitbox. That workflow is likely more familiar to most developers these
> > days, and the Github UI is significantly advanced beyond Gitbox.
> >
> > On Mon, Jul 13, 2020 at 2:20 PM Maarten Mulders <[hidden email]>
> wrote:
> >>
> >> Hi all,
> >>
> >> The other day I was working on a pull request offered through Github. I
> >> couldn't find instructions on how to accept and incorporate it. Based on
> >> my own experiences with submitting patches to Maven through Github I
> >> came up with a short how-to.
> >>
> >> I have written it down in a short guide "Working with Github pull
> >> requests" [1] which I intent to publish on the Apache Maven site, under
> >> "Maven Developer Centre / Committers". I would appreciate if some of you
> >> could take a look and see if the guide makes sense.
> >>
> >> Thanks,
> >>
> >> Maarten
> >>
> >> [1]
> >>
> https://gitbox.apache.org/repos/asf?p=maven-site.git;a=shortlog;h=refs/heads/add-github-pull-request-guide
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: [hidden email]
> >> For additional commands, e-mail: [hidden email]
> >>
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>
Reply | Threaded
Open this post in threaded view
|

Re: Short guide "Working with Github pull requests"

Olivier Lamy
Well personally I'm happy to use it for myself...
so please don;t remove it.
One of the most important point of the guide could be
***DO NOT CREATE PULL REQUEST FOR RIDICULOUS COMMIT WHICH DO NOT NEED
REVIEW***

it's very noisy and useless notifications (especially because we get
from both gitbox and github....)


On Tue, 14 Jul 2020 at 16:18, Maarten Mulders <[hidden email]>
wrote:

> Good point. I'll start by disabling the "Squash & merge" button using
> asf.yaml for the repositories I have cloned locally.
>
> Maarten
>
> On 13/07/2020 22:03, Elliotte Rusty Harold wrote:
> >>> So then the conclusion is, we can use Github for accepting & merging
> >>> pull requests, but shouldn't use "Squash & merge"?
> >
> > Buttons that shouldn't be used can be turned off by project owners in
> > the repo settings. There's no need to bother devs with remembering
> > which buttons should and should not be pressed (especially since
> > you'll get different answers to this question depending on who you
> > ask.)
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>

--
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy
Reply | Threaded
Open this post in threaded view
|

Re: Short guide "Working with Github pull requests"

Olivier Lamy
On Tue, 14 Jul 2020 at 16:37, Maarten Mulders <[hidden email]> wrote:

> Good part is, even though I followed the docs I couldn't get it to work
> for even one repo (maven-site). It still has the "Squash & merge" button.
>
> The guide I was proposing was for working with pull requests submitted
> by contributors, not for creating them. So I wasn't planning to add any
> words on when to create a pull request or not.
>
> I do agree that there's a lot of email generated. Sometimes even
> multiple emails with the same content in them. I think we should solve
> that by sending less notifications, not by creating less pull requests.
>

good point :) but remember we are commit then review mode
So for trivial change (such typo or some very ezy change) you don't need to.
Don't be scared to push without review, perso I will never blame someone
because he is doing something :)
If you're not confident with your changes go ahead and create PR
(especially if you want CI build) but please don't turn this into some
bureaucratic stuff.....

(welcome in the jungle with everyone having different opinion :) )

There must be a way, somewhere, to disable either the Github ones or the

> Gitbox ones.
>
> Maarten
>
> On 14/07/2020 08:25, Olivier Lamy wrote:
> > Well personally I'm happy to use it for myself...
> > so please don;t remove it.
> > One of the most important point of the guide could be
> > ***DO NOT CREATE PULL REQUEST FOR RIDICULOUS COMMIT WHICH DO NOT NEED
> > REVIEW***
> >
> > it's very noisy and useless notifications (especially because we get
> > from both gitbox and github....)
> >
> >
> > On Tue, 14 Jul 2020 at 16:18, Maarten Mulders <[hidden email]>
> > wrote:
> >
> >> Good point. I'll start by disabling the "Squash & merge" button using
> >> asf.yaml for the repositories I have cloned locally.
> >>
> >> Maarten
> >>
> >> On 13/07/2020 22:03, Elliotte Rusty Harold wrote:
> >>>>> So then the conclusion is, we can use Github for accepting & merging
> >>>>> pull requests, but shouldn't use "Squash & merge"?
> >>>
> >>> Buttons that shouldn't be used can be turned off by project owners in
> >>> the repo settings. There's no need to bother devs with remembering
> >>> which buttons should and should not be pressed (especially since
> >>> you'll get different answers to this question depending on who you
> >>> ask.)
> >>>
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: [hidden email]
> >> For additional commands, e-mail: [hidden email]
> >>
> >>
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>

--
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy