Deleted the last week of commits in main

[Ignacio Vera <iv...@gmail.com>]

Ignacio Vera <iv...@gmail.com>
5:05 PM (4 minutes ago)
to private
Sorry folks,

I was working on something and I screwed up my windows and I ended up
pushing into main a commit that is missing the last week of work (last
commit from September 24th).  I wonder if we have some procedure in this
case.

Sorry about that, I am gutted.

Ignacio

Re: Deleted the last week of commits in main

[Ignacio Vera <iv...@gmail.com>]

THe branch has been recovered thanks to Dawid, thank you!

On Tue, Sep 30, 2025 at 5:10 PM Ignacio Vera <iv...@gmail.com> wrote:

> Ignacio Vera <iv...@gmail.com>
> 5:05 PM (4 minutes ago)
> to private
> Sorry folks,
>
> I was working on something and I screwed up my windows and I ended up
> pushing into main a commit that is missing the last week of work (last
> commit from September 24th).  I wonder if we have some procedure in this
> case.
>
> Sorry about that, I am gutted.
>
> Ignacio
>

Re: Deleted the last week of commits in main

[Dawid Weiss <da...@gmail.com>]

> (we still need to confirm if the wildcards work but these branches should
> be safe).
>

Wildcards don't work but I added all the branch_* branches manually.


> Folks, you might see "git pull" fail with a fatal, due to remote branch
> being overwritten.
>

So it's caused by the fact that I manually cherry picked that single commit
I somehow overlooked (which caused the remote to deviate from what you
might have had pulled before). I could have fixed it too by doing another
force-push
with the original commit but in the end I didn't think it's that relevant.

Just resetting your local main branch to a few commits back and doing a git
> pull should fix it.


Correct. If you don't have any local changes on main (which you shouldn't
have), and you *are* on the main branch, this will do the trick (if you
have multiple remotes, you'll know which one is the right one...):

git fetch origin
git reset --hard origin/main

Dawid

Re: Deleted the last week of commits in main

[Vigya Sharma <vi...@gmail.com>]

Thank you Dawid, for fixing this promptly. And also adding protection
against force_push <https://github.com/apache/lucene/pull/15265> for main
and branch_10x (we still need to confirm if the wildcards work but these
branches should be safe).

Folks, you might see "git pull" fail with a fatal, due to remote branch
being overwritten. Just resetting your local main branch to a few commits
back and doing a git pull should fix it.


On Tue, Sep 30, 2025 at 9:26 AM Dawid Weiss <da...@gmail.com> wrote:

>
> This has been fixed already, no worries.
>
> Dawid
>
> On Tue, Sep 30, 2025 at 5:33 PM Ignacio Vera <iv...@gmail.com> wrote:
>
>> Ignacio Vera <iv...@gmail.com>
>> 5:05 PM (4 minutes ago)
>> to private
>> Sorry folks,
>>
>> I was working on something and I screwed up my windows and I ended up
>> pushing into main a commit that is missing the last week of work (last
>> commit from September 24th).  I wonder if we have some procedure in this
>> case.
>>
>> Sorry about that, I am gutted.
>>
>> Ignacio
>>
>

Re: Deleted the last week of commits in main

[Dawid Weiss <da...@gmail.com>]

This has been fixed already, no worries.

Dawid

On Tue, Sep 30, 2025 at 5:33 PM Ignacio Vera <iv...@gmail.com> wrote:

> Ignacio Vera <iv...@gmail.com>
> 5:05 PM (4 minutes ago)
> to private
> Sorry folks,
>
> I was working on something and I screwed up my windows and I ended up
> pushing into main a commit that is missing the last week of work (last
> commit from September 24th).  I wonder if we have some procedure in this
> case.
>
> Sorry about that, I am gutted.
>
> Ignacio
>