Thanks for the efforts, looks like you guys achieved a good solution,
congratulations for the merge to everyone involved.
Pedro.
On Thu, Oct 4, 2018 at 5:47 PM Carin Meier wrote:
> Micheal,
>
> Thanks. You were right! I could merge.
>
> The PR shows up now as merged
> https://github.com/apache/incubator-mxnet/pull/10149
> My merge commit is here
> https://github.com/apache/incubator-mxnet/commits/master
>
> Thanks again for the help.
>
> - Carin
>
>
>
> On Thu, Oct 4, 2018 at 8:09 PM Michael Wall wrote:
>
> > I would try the merge locally and then inspect the result closely to make
> > sure it looks like what you want. If it looks good, you could try
> pushing
> > to master. If you can't push, then we know but I "think" protected just
> > means you can't force push in this case based on
> > https://issues.apache.org/jira/browse/INFRA-15233 which links to
> > https://home.apache.org/~pono/mxnet.png. Maybe I have only tried that
> > with
> > repo that own though.
> >
> > I did find at least one ticket where a team asked for merge commits to be
> > enabled, https://issues.apache.org/jira/browse/INFRA-16690. But I think
> > they intend for it to stay that way. Is that what the community would
> want
> > for the MXNet repo? Or would you want to enable it for this and disable
> it
> > again?
> >
> >
> > On Thu, Oct 4, 2018 at 7:29 PM Carin Meier wrote:
> >
> > > Micheal,
> > >
> > > Thanks for catching up and helping us with this.
> > > I do see the "view command line instructions". I just assumed that
> master
> > > was a protected branch and I would not be able to push to it.
> > > Honestly, I'm a bit scared if it isn't :)
> > >
> > > What do you suggest? Should I try to merge and push to master?
> > >
> > > On Thu, Oct 4, 2018 at 7:19 PM Michael Wall wrote:
> > >
> > > > Just now looking at this. The button is disabled for merge commit as
> > you
> > > > have mentioned. Before I go to INFRA, is the command line an option?
> > Do
> > > > you see "or view command line instructions" beside the green squash
> and
> > > > merge button?
> > > >
> > > > On Thu, Oct 4, 2018 at 9:09 AM Carin Meier
> > wrote:
> > > >
> > > > > Thank you Mike!
> > > > >
> > > > > On Thu, Oct 4, 2018 at 8:54 AM Michael Wall
> > wrote:
> > > > >
> > > > > > Hi Carin,
> > > > > >
> > > > > > I will take a look at this tonight. I am not tracking
> everything,
> > > so I
> > > > > > want to go back and make sure I understand what is being asked.
> > > Then I
> > > > > am
> > > > > > happy to submit an INFRA ticket.
> > > > > >
> > > > > > Mike
> > > > > >
> > > > > > On Thu, Oct 4, 2018 at 8:36 AM Carin Meier >
> > > > wrote:
> > > > > >
> > > > > > > I just found out that since we are a podling, we should route
> all
> > > our
> > > > > > Infra
> > > > > > > tickets through one of our mentors and link the dev list
> > discussion
> > > > in
> > > > > > > JIRA.
> > > > > > >
> > > > > > > Is there a mentor that is willing to help us navigate this
> > process
> > > to
> > > > > get
> > > > > > > the PR merged?
> > > > > > >
> > > > > > > Thanks,
> > > > > > > Carin
> > > > > > >
> > > > > > > On Tue, Oct 2, 2018 at 8:42 AM Carin Meier <
> carinme...@gmail.com
> > >
> > > > > wrote:
> > > > > > >
> > > > > > > > Marco - Thanks for the "dry run" idea. It will give everyone
> a
> > > > clear
> > > > > > idea
> > > > > > > > of the process and what the expected results will look like.
> > > > > > > >
> > > > > > > > - I took my fork of the repo and synced my master branch.
> > > > > > > > - @iblis17 made a copy of the branch of the Julia import PR
> and
> > > > > > submitted
> > > > > > > > it to my repo
> > > > > > > > - I merged it with the "Merge" option through the web
> > interface.
> > > > > > > >
> > > > > > > > Here is a gif of the process of merging:
> > > > > > > > http://g.recordit.co/DzBcFtnjmV.gif
> > > > > > > > Here is the result of the repo:
> > > > > > > > https://github.com/gigasquid/incubator-mxnet
> > > > > > > >
> > > > > > > > Please everyone take a look and validate that this looks ok.
> > > > > > > >
> > > > > > > > If there are no objections, Marco - could you please take the
> > > lead
> > > > in
> > > > > > > > requesting the actions from INFRA?
> > > > > > > >
> > > > > > > > It will be great to *finally* get this PR in :)
> > > > > > > >
> > > > > > > > Thanks,
> > > > > > > > Carin
> > > > > > > >
> > > > > > > > <
> > > > https://github.com/gigasquid/incubator-mxnet/commits?author=iblis17
> > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > On Sat, Sep 29, 2018 at 10:02 PM Chiyuan Zhang <
> > > plus...@gmail.com>
> > > > > > > wrote:
> > > > > > > >
> > > > > > > >> Sorry, here is the image: https://imgur.com/V5wd2XB
> > > > > > > >>
> > > > > > > >> And here is the github document on the 3 different merge
> > options
> > > > for
> > > > > > the
> > > > > > > >> web UI button:
> > > > > > > >> https://help.github.com/articles/about-pull-request-merges/
> > > > > > > >>
> >
