Personally, I would rebase main (including the following commit). It’s unlikely that you will break someone, because the contents of main will be unchanged by your rebase.
> On Jan 10, 2026, at 9:09 AM, Mihai Budiu <[email protected]> wrote: > > Hello all, > > By mistake I have merged a PR yesterday without squashing a commit. > Since there has been another PR merged following it, I propose to leave it as > it is. > > [<https://github.com/apache/calcite/commit/073942c19377ef527892b0c2ecb2fa3f3a9f3db6>CALCITE-7367<https://issues.apache.org/jira/browse/CALCITE-7367>] > NULLS FIRST throws ClassCastException when sorting > arrays<https://github.com/apache/calcite/commit/073942c19377ef527892b0c2ecb2fa3f3a9f3db6> > > * > Change Map literal implementation to Java > Map<https://github.com/apache/calcite/commit/3e1091b73d74c9238fb09548c897c6a6350676bb> > > * > [<https://github.com/apache/calcite/commit/a124dc7bee1195085d333515a2af57cbeb388870>CALCITE-7366<https://issues.apache.org/jira/browse/CALCITE-7366>] > > RexLiteral<https://github.com/apache/calcite/commit/a124dc7bee1195085d333515a2af57cbeb388870> > > I will try to be more careful in the future. > > Thank you, > Mihai > >
