Homebrew on non-silicon macs

[skiabox]

Hello guys.
I have a macbook pro 16.
I am getting the following message from homebrew lately.

Updating Homebrew...
error: could not apply 6b24ba6... Test build on arm64
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6b24ba6... Test build on arm64

Any ideas?

 

[claudiu.cristea]

@skiabox how did you manage to fix it?

 

[skiabox]

@claudiu.cristea I think that they fixed that error.

 

[claudiu.cristea]

When you say "they" do you refer to Brew? Because I'm still getting the error:

$ brew update
error: could not apply 6b24ba6... Test build on arm64
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6b24ba6... Test build on arm64
No stash entries found.
Updated Homebrew from f5bad8299 to be96bfdfb.

I'm on https://github.com/Homebrew/brew/releases/tag/3.2.10