You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apisix.apache.org by Sober <ws...@163.com> on 2021/12/23 06:18:45 UTC
how can help me.I want restore these file.
hi dev:
I mistakenly deleted some file at apisix-ingress-controller PR #666. next I restore these file from histroy HEAD, resubmit my commit ,but I feel I can't catch up with the mainline version. : (
mistakenly deleted file at docs/*.
Re: Re: how can help me.I want restore these file.
Posted by Qi Guo <gu...@gmail.com>.
Hi, Sober,
> I always submit the master branch.
Just a few of my suggestions:
1. If we commit our code directly to the master branch of our own
repository,
we may mess up our commit records when we create a PR to the master
repository.
2. We may often have code conflicts with the main repository.
We can add an upstream repository for our own repository pointing to the
main repository
so that we can update and manage code in a timely manner.
Best regards!
Zhiyuan Ju <ju...@apache.org> 于2021年12月23日周四 17:30写道：
> Hi Sober,
>
> Glad to hear from you, it's more like a Git workflow issue, how about
> scheduling a public online meet? I'm glad to chat & help you on this :)
>
> Best Regards!
> @ Zhiyuan Ju <https://github.com/juzhiyuan>
>
>
> Sober <ws...@163.com> 于2021年12月23日周四 15:21写道：
>
> > Hi Zhiyuan,Jintao
> >
> > I just submit the cmd/plugin/* code file . I don't know the code
> commit
> > rule at apisix community ,Can you tell about it?
> >
> > if my project ,I always submit the master branch.
> >
> >
> >
> >
> >
> >
> >
> >
> >
> >
> >
> >
> >
> >
> >
> > 在 2021-12-23 14:23:27，"Zhiyuan Ju" <ju...@apache.org> 写道：
> > >Hi Sober,
> > >
> > >I just checked your PR
> > >https://github.com/apache/apisix-ingress-controller/pull/666, just to
> > make
> > >sure, do you want to sync codes with the master branch?
> > >
> > >Best Regards!
> > >@ Zhiyuan Ju <https://github.com/juzhiyuan>
> > >
> > >
> > >Sober <ws...@163.com> 于2021年12月23日周四 14:19写道：
> > >
> > >> hi dev:
> > >> I mistakenly deleted some file at apisix-ingress-controller PR
> #666.
> > >> next I restore these file from histroy HEAD, resubmit my commit ,but I
> > feel
> > >> I can't catch up with the mainline version. : (
> > >> mistakenly deleted file at docs/*.
> > >>
> >
>
Re: Re: how can help me.I want restore these file.
Posted by Zhiyuan Ju <ju...@apache.org>.
Hi Sober,
Glad to hear from you, it's more like a Git workflow issue, how about
scheduling a public online meet? I'm glad to chat & help you on this :)
Best Regards!
@ Zhiyuan Ju <https://github.com/juzhiyuan>
Sober <ws...@163.com> 于2021年12月23日周四 15:21写道：
> Hi Zhiyuan,Jintao
>
> I just submit the cmd/plugin/* code file . I don't know the code commit
> rule at apisix community ,Can you tell about it?
>
> if my project ,I always submit the master branch.
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
> 在 2021-12-23 14:23:27，"Zhiyuan Ju" <ju...@apache.org> 写道：
> >Hi Sober,
> >
> >I just checked your PR
> >https://github.com/apache/apisix-ingress-controller/pull/666, just to
> make
> >sure, do you want to sync codes with the master branch?
> >
> >Best Regards!
> >@ Zhiyuan Ju <https://github.com/juzhiyuan>
> >
> >
> >Sober <ws...@163.com> 于2021年12月23日周四 14:19写道：
> >
> >> hi dev:
> >> I mistakenly deleted some file at apisix-ingress-controller PR #666.
> >> next I restore these file from histroy HEAD, resubmit my commit ,but I
> feel
> >> I can't catch up with the mainline version. : (
> >> mistakenly deleted file at docs/*.
> >>
>
Re:Re: how can help me.I want restore these file.
Posted by Sober <ws...@163.com>.
Hi Zhiyuan,Jintao
I just submit the cmd/plugin/* code file . I don't know the code commit rule at apisix community ,Can you tell about it?
if my project ,I always submit the master branch.
在 2021-12-23 14:23:27，"Zhiyuan Ju" <ju...@apache.org> 写道：
>Hi Sober,
>
>I just checked your PR
>https://github.com/apache/apisix-ingress-controller/pull/666, just to make
>sure, do you want to sync codes with the master branch?
>
>Best Regards!
>@ Zhiyuan Ju <https://github.com/juzhiyuan>
>
>
>Sober <ws...@163.com> 于2021年12月23日周四 14:19写道：
>
>> hi dev:
>> I mistakenly deleted some file at apisix-ingress-controller PR #666.
>> next I restore these file from histroy HEAD, resubmit my commit ,but I feel
>> I can't catch up with the mainline version. : (
>> mistakenly deleted file at docs/*.
>>
Re: how can help me.I want restore these file.
Posted by Jintao Zhang <zh...@gmail.com>.
Are you facing any problems? If you can’t solve it, I can assist.
Zhiyuan Ju <ju...@apache.org> 于2021年12月23日周四 14:24写道：
> Hi Sober,
>
> I just checked your PR
> https://github.com/apache/apisix-ingress-controller/pull/666, just to make
> sure, do you want to sync codes with the master branch?
>
> Best Regards!
> @ Zhiyuan Ju <https://github.com/juzhiyuan>
>
>
> Sober <ws...@163.com> 于2021年12月23日周四 14:19写道：
>
> > hi dev:
> > I mistakenly deleted some file at apisix-ingress-controller PR #666.
> > next I restore these file from histroy HEAD, resubmit my commit ,but I
> feel
> > I can't catch up with the mainline version. : (
> > mistakenly deleted file at docs/*.
> >
>
Re: how can help me.I want restore these file.
Posted by Zhiyuan Ju <ju...@apache.org>.
Hi Sober,
I just checked your PR
https://github.com/apache/apisix-ingress-controller/pull/666, just to make
sure, do you want to sync codes with the master branch?
Best Regards!
@ Zhiyuan Ju <https://github.com/juzhiyuan>
Sober <ws...@163.com> 于2021年12月23日周四 14:19写道：
> hi dev:
> I mistakenly deleted some file at apisix-ingress-controller PR #666.
> next I restore these file from histroy HEAD, resubmit my commit ,but I feel
> I can't catch up with the mainline version. : (
> mistakenly deleted file at docs/*.
>