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 <spudan...@gmail.com> wrote: > > 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 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 [incubator-nuttx] branch master updated (ac55fab -> 434086f) > > Date Mon, 27 Apr 2020 13:39:41 GMT > > > > This is an automated email from the ASF dual-hosted git repository. > > > > xiaoxiang pushed a change to branch master > > in repositoryhttps://gitbox.apache.org/repos/asf/incubator-nuttx.git. > > > > > > from ac55fab syslog: Check sc_flush in't NULL before invocation > > add e9773ad syslog/rpmsg: Fix warning: ‘syslog_rpmsg_write’ > > defined but not used > > add 972033a syslog: Check sc_flush in't NULL before invocation > > add 2bfc03f openamp: Download libmetal and open-amp from github > > add 434086f Merge branch 'master' of > > github.com:apache/incubator-nuttx into openamp > > > > No new revisions were added by this update. > > > > Summary of changes: > > > > > > Mime > > > > * Unnamed text/plain > > > > <https://mail-archives.apache.org/mod_mbox/nuttx-commits/202004.mbox/raw/%3C158799478114.332.2427650942959628664%40gitbox.apache.org%3E/> > > (inline, 8-Bit, 642 bytes) > > > > >
