Hi all,
I have completed the forced fix and temporarily kept a backup-ea985df branch (which is identical to the previous main branch). The CI now passes successfully. If there are no other issues, I will delete this temporary branch in a few weeks. Special thanks to Stamatis and Michael for their prompt responses and help. I apologize again for the inconvenience. Best, Zhen Chen At 2025-09-06 20:28:18, "我" <czjour...@163.com> wrote: >Thank you very much Michael, I will use the method you told me to correct the >latest erroneous merge. > > >---- Replied Message ---- >| From | Michael Mior<mm...@apache.org> | >| Date | 09/06/2025 20:18 | >| To | dev@calcite.apache.org | >| Cc | | >| Subject | Re: Apply for revert PR | >Zhen, > >We've generally considered a force push shortly after a commit is made to >fix an issue acceptable. (To be extra safe, use --force-push-with-lease >which will reject the force push if anyone else has pushed since your last >update.) > >-- >Michael Mior >mm...@apache.org > > >On Sat, Sep 6, 2025 at 8:13 AM 我 <czjour...@163.com> wrote: > >> Hi all, >> >> >> >> I'm very sorry that I didn't check the commit information carefully in >> PR[1], which resulted in multiple inconsistent commits being merged in. I >> wanted to try reverting, but I'm worried about polluting the commit >> message. So, I'd like to squash the commits as the original PR author and >> force-push a new commit to the main branch. Could you please help me figure >> out if this solution is feasible? If so, I'll proceed. >> >> >> [1] https://github.com/apache/calcite/pull/4501 >> >> >> Best, >> Zhen Chen
