Re: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-18 Thread Nathan Hartman
On Fri, Feb 18, 2022 at 5:27 AM Xiang Xiao wrote: > > On Fri, Feb 18, 2022 at 3:52 PM Petro Karashchenko < > petro.karashche...@gmail.com> wrote: > > > Hi, > > > > I agree that auto-merge should not be used. > > > > But I disagree that "as it is now since almost all patches follow the > > rule and

Re: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-18 Thread Xiang Xiao
do the merge. For complex changes the person outside the > > > organization should perform the merge even if there are more than 1 > > > approval from inside the company/organization. > > > > I agree. > > > > David > > > > -Original Me

Re: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-18 Thread Petro Karashchenko
patches follow the rule and seldom someone self-merges a patch. > > > > > > Also we should note that in case some patches land accidentally in the > > master branch we can always revert them if it is necessary > > > > > > Best regards > > > Alin > &

Re: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-18 Thread Alin Jerpelea
; > can do the merge. For complex changes the person outside the > > > organization should perform the merge even if there are more than 1 > > > approval from inside the company/organization. > > > > I agree. > > > > David > > > > -Origina

Re: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-17 Thread Petro Karashchenko
land accidentally in the master > branch we can always revert them if it is necessary > > Best regards > Alin > > -Original Message- > From: David Sidrane > Sent: den 17 februari 2022 22:31 > To: dev@nuttx.apache.org > Subject: RE: [DISCUSS]: Self merge an

RE: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-17 Thread alin.jerpe...@sony.com
Subject: RE: [DISCUSS]: Self merge and Single company/organization merge gating On Self merge: As Nathan pointed out, it is more about time zones then merge velocity. However, using a backport only methodology requires an upstream merge before the work can be backported with least effort and adds a

Re: RE: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-17 Thread Jukka Laitinen
the person outside the organization > > should perform the merge even if there are more than 1 approval from > > inside the company/organization. > > I agree. > > David > > -Original Message- > From: Petro Karashchenko > Sent: Thursday, February 17, 20

RE: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-17 Thread David Sidrane
t; should perform the merge even if there are more than 1 approval from > inside the company/organization. I agree. David -Original Message- From: Petro Karashchenko Sent: Thursday, February 17, 2022 1:01 PM To: dev@nuttx.apache.org Subject: Re: [DISCUSS]: Self merge and Single company/

Re: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-17 Thread Petro Karashchenko
Hello, Regarding PRs megre by the author: I think that if the changes are relatively simple (again that is very subjective, but I hope that people with merge rights have more or less the same common sense of it) and there is an approval from outside of the company/organization then the author can

Re: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-15 Thread Nathan Hartman
On Mon, Feb 14, 2022 at 2:01 PM Brennan Ashton wrote: > > Background: > I am generally opposed to both of these. It is quite rare that we need a > crazy fast merge turn around on a PR. And if something is approved and > straight up broken in master that needs to get in then I think forgiveness > c

Re: [DISCUSS]: Self merge and Single company/organization merge gating

2022-02-14 Thread Brennan Ashton
On Mon, Feb 14, 2022, 9:28 AM David Sidrane wrote: > I am opening this discussion to widen the audience for feedback on the > rules for merging. The original interexchange was in [1] > > > > 1 ) Given the geographical and time differences should we consider that > once a review with approval* has

[DISCUSS]: Self merge and Single company/organization merge gating

2022-02-14 Thread David Sidrane
I am opening this discussion to widen the audience for feedback on the rules for merging. The original interexchange was in [1] 1 ) Given the geographical and time differences should we consider that once a review with approval* has been done the PR’s author can merge it? 2) Should we conside