You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@calcite.apache.org by Mihai Budiu <mb...@gmail.com> on 2023/12/10 21:20:51 UTC

squashing commit already in upstream

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

Re: squashing commit already in upstream

Posted by Michael Mior <mm...@apache.org>.
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
mmior@apache.org


On Sun, Dec 10, 2023 at 4:21 PM Mihai Budiu <mb...@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
>

Re: squashing commit already in upstream

Posted by Francis Chuang <fr...@apache.org>.
As your 2 commits are the first 2 commits on main, I think it's okay if 
you go ahead and squash them. Since they were committed on the weekend, 
I don't think too many people would have updated their main branch.

Francis

On 11/12/2023 8:20 am, Mihai Budiu 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
>