I would also be +1 for keeping it in place. It certainly doesn't solve all
the problems, but using --force-with-lease instead of --force is generally
a good idea. It just makes sure no one else has pushed anything since your
last update. If they have, it will block the force push. At that point, if
I still wanted to force push, I would rebase to incorporate their changes
if possible, and make sure I notify whoever pushed.

--
Michael Mior
[email protected]


On Fri, Jul 7, 2023 at 2:19 PM Julian Hyde <[email protected]> wrote:

> > I prefer keeping force push in place
>
> +1. I use force push about a dozen times a year and hopefully no one
> notices. It helps the commit history clean.
>
> I know that force pushes can confuse CI systems and make things confusing
> to other users, so I try to be judicious. I trust other committers to do
> the same. (I suspect that this was a learning experience for Tanner.)
>
> Julian
>
>
> > On Jul 7, 2023, at 4:12 AM, Stamatis Zampetakis <[email protected]>
> wrote:
> >
> > @Tanner No worries we all did this at some point in time, thanks a lot
> > for following up!
> >
> > @Stanilovsky: I prefer keeping force push in place and avoiding messy
> > reverts that are usually necessary in various situations where we make
> > a mistake. All commits are archived so there is nothing that we can't
> > fix (I think).
> >
> > On Thu, Jul 6, 2023 at 3:45 PM Tanner Clary
> > <[email protected]> wrote:
> >>
> >> Hello,
> >>
> >> This was my mistake, my apologies. I will update the hashes. Sorry for
> any
> >> inconvenience.
> >>
> >> Tanner
> >>
> >> On Thu, Jul 6, 2023 at 3:34 AM stanilovsky evgeny <
> >> [email protected]> wrote:
> >>
> >>> I already told that community need to vote for prohibit force push.
> >>>
> >>>> Hello,
> >>>>
> >>>> It appears that there was a force push to main yesterday [1] rewriting
> >>>> the history for a bunch of commits. I don't know if it was intentional
> >>>> or not but it seems that now resolved JIRAs (after CALCITE-5810 I
> >>>> think) are pointing to non-existent commits.
> >>>>
> >>>> Can someone please update the JIRA tickets with the correct commit
> >>>> hashes and also ensure that we didn't lose anything after the rebase?
> >>>>
> >>>> Best,
> >>>> Stamatis
> >>>>
> >>>> [1] https://lists.apache.org/thread/7jjnbkkh9tv49sjcc5kg2tm7c54tj861
> >>>
>
>

Reply via email to