Hi Denis, Thank you, yes I will use the GitHub built-in capabilities.
Regards, Saikat On Mon, Apr 20, 2020 at 1:01 PM Denis Magda <dma...@apache.org> wrote: > Saikat, now I see your point, thanks for breaking it down. As of now, there > is no need for those scripts, at least, for the website repository. It's > easy to review and merge changes using GitHub built-in capabilities and > controls with all the changes propagated to ASF's repos. > > - > Denis > > > On Sun, Apr 19, 2020 at 4:43 AM Dmitriy Pavlov <dpav...@apache.org> wrote: > > > Yes, most likely there are 2 separate repos (presumably, gitbox servers > > provided by Microsoft - not 100% sure here), but these repositories have > > fast 2-way sync now. I remember that Infra fixed something in this sync. > > > > вс, 19 апр. 2020 г. в 02:57, Saikat Maitra <saikat.mai...@gmail.com>: > > > > > Hi Dmitriy, > > > > > > Thank you for your email. I am fine with Github built-in merge tool. > > > > > > Since, in ignite repo we were using the apply-pull-request.sh script > and > > > pushing changes to gitbox ( > > https://gitbox.apache.org/repos/asf/ignite.git) > > > > > > I noted that it was immediately syncing the changes in github as well. > > > > > > My understanding is the repo sync is two way and if we merge changes in > > > github then also it will be synced back to gitbox repo. > > > > > > Regards, > > > Saikat > > > > > > > > > > > > On Sat, Apr 18, 2020 at 6:40 PM Dmitriy Pavlov <dpav...@apache.org> > > wrote: > > > > > > > Hi Folks, > > > > > > > > Thanks, to Denis and Infra > > > > > > > > Saikat, > > > > > > > > with a slight risk of starting off-topic discussions about that, I > > > > nevertheless would like to suggest using GitHub build-in merge tool > for > > > PRs > > > > in the ignite-website. It always closes PRs, it closes right PR, so I > > > find > > > > this option less error-prone. Since Infra integrated ASF repos with > > > GitHub > > > > It is really easy to merge changes. > > > > > > > > But still, if you find having apply-pr script useful by any means, > > sure, > > > go > > > > ahead. There are no restrictions there. > > > > > > > > Sincerely, > > > > Dmitriy Pavlov > > > > > > > > сб, 18 апр. 2020 г. в 21:43, Saikat Maitra <saikat.mai...@gmail.com > >: > > > > > > > > > Hi Denis, > > > > > > > > > > Thank you for your email. Yes, the docs looks good. > > > > > > > > > > I was asking about this script that we use in ignite repo as well > for > > > > > committing changes. > > > > > > > > > > > > > > > > > > > > https://github.com/apache/ignite/blob/master/scripts/apply-pull-request.sh > > > > > > > > > > Regards, > > > > > Saikat > > > > > > > > > > > > > > > > > > > > On Mon, Apr 13, 2020 at 11:53 AM Denis Magda <dma...@apache.org> > > > wrote: > > > > > > > > > > > Hello Saikat, > > > > > > > > > > > > You can find short website development guidelines on this page > [1]. > > > > They > > > > > > are elementary and request to use pull-requests, especially, if > the > > > one > > > > > is > > > > > > not a committer. Feel free to elaborate on the process. > > > > > > > > > > > > Btw, what are the scripts referred by you? > > > > > > > > > > > > [1] > > > > > > > https://cwiki.apache.org/confluence/display/IGNITE/Website+Development > > > > > > - > > > > > > Denis > > > > > > > > > > > > > > > > > > On Sun, Apr 12, 2020 at 12:26 PM Saikat Maitra < > > > > saikat.mai...@gmail.com> > > > > > > wrote: > > > > > > > > > > > > > Hello, > > > > > > > > > > > > > > Are we following the same contribution flow as we are doing for > > > > ignite > > > > > > git > > > > > > > repo? > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-ClosingaTicket > > > > > > > > > > > > > > I have observed that github ignite-website is also mirrored at > > > > > > > https://gitbox.apache.org/repos/asf?p=ignite-website.git > > > > > > > > > > > > > > I can add our scripts folder in ignite-website folder if it > > helps. > > > > > > > > > > > > > > Regards, > > > > > > > Saikat > > > > > > > > > > > > > > On Tue, Apr 7, 2020 at 12:49 AM Ivan Pavlukhin < > > > vololo...@gmail.com> > > > > > > > wrote: > > > > > > > > > > > > > > > Thank you! > > > > > > > > > > > > > > > > Best regards, > > > > > > > > Ivan Pavlukhin > > > > > > > > > > > > > > > > вт, 7 апр. 2020 г. в 00:46, Denis Magda <dma...@apache.org>: > > > > > > > > > > > > > > > > > > The website is back to normal and serves the content from > the > > > Git > > > > > > > > > repository's "master" branch: > > > > > > > > > https://github.com/apache/ignite-website/blob/master > > > > > > > > > > > > > > > > > > - > > > > > > > > > Denis > > > > > > > > > > > > > > > > > > > > > > > > > > > On Mon, Apr 6, 2020 at 2:19 PM Denis Magda < > > dma...@apache.org> > > > > > > wrote: > > > > > > > > > > > > > > > > > > > I'm checking with the INFRA. It's down for at least the > > last > > > > > couple > > > > > > > of > > > > > > > > > > hours. > > > > > > > > > > > > > > > > > > > > - > > > > > > > > > > Denis > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On Mon, Apr 6, 2020 at 12:44 PM Ivan Pavlukhin < > > > > > > vololo...@gmail.com> > > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > >> Denis, > > > > > > > > > >> > > > > > > > > > >> Is it expected that main website > > https://ignite.apache.org/ > > > > > does > > > > > > > not > > > > > > > > > >> work now? > > > > > > > > > >> > > > > > > > > > >> Best regards, > > > > > > > > > >> Ivan Pavlukhin > > > > > > > > > >> > > > > > > > > > >> сб, 4 апр. 2020 г. в 01:15, Denis Magda < > > dma...@apache.org > > > >: > > > > > > > > > >> > > > > > > > > > > >> > Igniters, > > > > > > > > > >> > > > > > > > > > > >> > Please avoid any commits to the website repository > until > > > > > further > > > > > > > > notice. > > > > > > > > > >> > We're in a process of the migration: > > > > > > > > > >> > https://issues.apache.org/jira/browse/INFRA-20065 > > > > > > > > > >> > > > > > > > > > > >> > - > > > > > > > > > >> > Denis > > > > > > > > > >> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >