Btw, I'm setting reviewers (Toni, Mario, Dominik, Alex, Yeser) on the split PRs. If at least two of the reviewers are okay with the original PR ( https://github.com/apache/incubator-kie-docs/pull/4545), I can assume that I get approvals on the split PRs, so I would merge them immediately without bothering you with zulip ping. So if you are okay with the original PR, please give Ack on this mail thread. Thanks!
On Thu, May 8, 2025 at 5:54 PM Toshiya Kobayashi <toshiyakobaya...@gmail.com> wrote: > Thank you for the suggestion, Fabrizio. > > I have started the split PRs as I thought that 10 PRs is an acceptable > workload. > > Of course, it's worth discussing the exceptional procedure, so we will be > ready for a future similar case. > > Thanks, > Toshiya > > On Thu, May 8, 2025 at 5:09 PM Fabrizio Antonangeli < > fantonang...@apache.org> wrote: > >> Otherwise, if the PR is already reviewed and people agree, I think >> merging manually (without squashing) and push directly on `main` >> without GH Web, can be an easier option. >> I would suggest keeping a copy of the current `main` branch, to be >> safe, as the past git history will change. >> This way you avoid creating 10 PRs, ask for reviews, then merge. >> Let's see other's opinion. >> >> On Thu, 2025-05-08 at 16:44 +0900, Toshiya Kobayashi wrote: >> > Ouch, there is a severe limitation: >> > >> > >> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits >> > >> > Rebase limits >> > === >> > Merging a pull request using the "Rebase and merge" option is limited >> > to >> > 100 commits. If you have a pull request with more than 100 commits, >> > you >> > need to create a merge commit, squash and merge, or split the commits >> > up >> > into multiple pull requests. >> > === >> > >> > My PR has 988 commits. There might be a workaround, but I'm going to >> > split >> > the PR to 10 PRs, which is straightforward. >> > >> > Toshiya >> > >> > On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi >> > <toshiyakobaya...@gmail.com> >> > wrote: >> > >> > > I posted the steps to move the commit history. >> > > >> > > >> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969 >> > > >> > > However, I found that the PR cannot "Rebase and merge" in github >> > > UI, even >> > > though it has been rebased with upstream/main locally. >> > > >> > > Probably the steps are okay for other docs. drools-docs has a long >> > > commit >> > > history including migration from another repo, so it makes the >> > > commit >> > > messy. I'm investigating now... >> > > >> > > Toshiya >> > > >> > > >> > > On Wed, May 7, 2025 at 10:17 PM Tiago Bento <tiagobe...@apache.org> >> > > wrote: >> > > >> > > > Thank you Toshiya! Great initiative. Do you think this PR is >> > > > enough >> > > > for people doing the same for other docs? Maybe some pointers on >> > > > how >> > > > you were able to keep the commit history, for example? Thanks!! >> > > > >> > > > On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi >> > > > <toshiyakobaya...@gmail.com> wrote: >> > > > > >> > > > > Hi all, >> > > > > >> > > > > I have filed a PR to move incubator-kie-drools/drools-docs >> > > > > under >> > > > > incubator-kie-docs in order to resolve a license issue. >> > > > > >> > > > > https://github.com/apache/incubator-kie-docs/pull/4545 >> > > > > >> > > > > Once merged, I will remove drools-docs from incubator-kie- >> > > > > drools:main. >> > > > > >> > > > > This is just a heads-up and I hope it's not something to >> > > > > require a vote. >> > > > > >> > > > > Regards, >> > > > > Toshiya >> > > > >> > > > ----------------------------------------------------------------- >> > > > ---- >> > > > To unsubscribe, e-mail: dev-unsubscr...@kie.apache.org >> > > > For additional commands, e-mail: dev-h...@kie.apache.org >> > > > >> > > > >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscr...@kie.apache.org >> For additional commands, e-mail: dev-h...@kie.apache.org >> >>
