Since this would require a force push, I would suggest fetching from the remote first and then making sure you rebase if necessary while squashing then use --force-with-lease instead of --force to make sure any changes that may have been pushed are incorporated. If you do end up seeing that someone else has pushed before you squash, I don't think that means a force push is out of the question, but in that case, it would probably be good to send a quick note to the dev list to make sure everyone is aware.
-- Michael Mior mm...@apache.org On Sun, Dec 10, 2023 at 4:21 PM Mihai Budiu <mbu...@gmail.com> wrote: > Hello, > > By mistake I merged a PR which contained two commits instead of the > customary one. What is the policy (and method) for fixing this for the > Calcite repository? > > > https://github.com/apache/calcite/commit/5b441c639de1ec428891061b931bd69d9996efe4 > > Should have been squashed into > > > https://github.com/apache/calcite/commit/1b36f07ce98f0e6d620b5ea1e1c773b376c3e81e > > Sorry for the complications, I will double check next time. > > Thank you, > Mihai >
