On Tue, Apr 28, 2020 at 10:49 PM Nathan Hartman
wrote:
>
> On Tue, Apr 28, 2020 at 10:38 AM Gregory Nutt wrote:
>
> > > The maintainer still can create a new branch and push to that branch
> > directly, only the master branch get the strict protection. The setting
> > must be done by INFRA team
> I'm guessing that for this particular instance, someone could fork the repo
> and then open a PR from their SocketCAN branch to our master? But.
We can open a pull request from the main repo.
What Xiang is suggesting is to only protect master or any other branch
pattern we want. That won't
On Tue, Apr 28, 2020 at 10:38 AM Gregory Nutt wrote:
> > The maintainer still can create a new branch and push to that branch
> directly, only the master branch get the strict protection. The setting
> must be done by INFRA team, I can raise a JIRA ticket if the community
> agree that it's the
> The maintainer still can create a new branch and push to that branch
directly, only the master branch get the strict protection. The setting
must be done by INFRA team, I can raise a JIRA ticket if the community
agree that it's the right direction to go.
How would we perform development on
commits to repository
What I meant is what Github uses when rebasing.
I guess it rebases the PR's in a topic branch on top of master then
fast-forward merges. So we should be good.
That being said whether we disable force pushing or not, it won't prevent
us from making a non-for
On Mon, Apr 27, 2020 at 11:47 PM Xiang Xiao
wrote:
>
> The maintainer still can create a new branch and push to that branch
> directly, only the master branch get the strict protection.
> The setting must be done by INFRA team, I can raise a JIRA ticket if the
> community agree that it's the righ
I think we could ask Infra to set some 'protected' branches, which means we
can not do force push on these branches, but I'm not sure if it is possible
to forbid a simple push...
In my experience, I've pushed wrong commits to the repo when developing
projects in ASF, and usually the solution is to
No sure what happen, maybe I push the wrong remote git? Does github
have any configuration to enforce all merge must come from web UI?
In this case, AFAIK no harm was done. A little bit a odd history was
added but no file changes. So I think we are good. We do need to be
careful; all of
There is but I don't think it is configurable via the .asf.yaml file, so
I'm not sure how we could enable it.
--Brennan
On Mon, Apr 27, 2020, 7:33 PM Xiang Xiao wrote:
> No sure what happen, maybe I push the wrong remote git? Does github
> have any configuration to enforce all merge must come f
No sure what happen, maybe I push the wrong remote git? Does github
have any configuration to enforce all merge must come from web UI?
On Mon, Apr 27, 2020 at 11:47 PM Gregory Nutt wrote:
>
> He can also see all of the merges made earlier in the day, include the
> merge of Juha's PR. They did no
He can also see all of the merges made earlier in the day, include the
merge of Juha's PR. They did not cause the problem. This one direct
merge to incubator_nuttx caused the wild merge messages and the
duplicate commits:
On 4/27/2020 9:37 AM, Gregory Nutt wrote:
... it is hard to constru
... it is hard to construct what happened in the past from the present.
I forget about the commit messages. This makes it clear exactly what
happened
(https://mail-archives.apache.org/mod_mbox/nuttx-commits/202004.mbox/browser):
From xiaoxi...@apache.org
Subject [incubat
Yes, here is the PR I sent from my openamp branch:
https://github.com/apache/incubator-nuttx/pull/894
But merged by you two hour ago.
Do you select "Create a merge commit" or "Rebase and merge"?
I always select rebase and merge, but it is hard to construct what
happened in the past from the
On Mon, Apr 27, 2020 at 10:51 PM Gregory Nutt wrote:
>
>
> > The PR come from Juha:
> > https://github.com/apache/incubator-nuttx/pull/892
>
> Juha's PR looks clean to me.
>
> > But this PR just change the code under libs/libc/netdb, I don't know
> > why the commit log show:
> > arch/mips/src/pic3
The PR come from Juha:
https://github.com/apache/incubator-nuttx/pull/892
Juha's PR looks clean to me.
But this PR just change the code under libs/libc/netdb, I don't know
why the commit log show:
arch/mips/src/pic32mz/pic32mz_oneshot-lowerhalf.c is deleted
arch/mips/src/pic32mz/pic32mz_ones
The PR come from Juha:
https://github.com/apache/incubator-nuttx/pull/892
But this PR just change the code under libs/libc/netdb, I don't know
why the commit log show:
arch/mips/src/pic32mz/pic32mz_oneshot-lowerhalf.c is deleted
arch/mips/src/pic32mz/pic32mz_oneshot_lowerhalf.c is modified
On Mon,
I am looking at this merge in the incubator master
https://github.com/apache/incubator-nuttx/commit/434086ff935a760d274518d79d2abcf99294fc6f
along with three additional commits.
These appear to have gone directly to incubator_nuttx/master without
going through a PR. Was this a mistake?
I
17 matches
Mail list logo
