brew update fails with rebase issue

[Lee Willis]

Describe the bug
Brew update fails with a rebase issue:

$ brew update
error: could not apply 2e3ca1c... php@8.1: rebuild
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 2e3ca1c... php@8.1: rebuild
Updated 1 tap (shivammathur/php).

The git status is as follows:

$ git status
interactive rebase in progress; onto 1b84c2b
Last command done (1 command done):
   pick 2e3ca1c php@8.1: rebuild
Next commands to do (3 remaining commands):
   pick f25d04f php@8.1: update 8.1.0 bottle.
   pick a9869cb php@8.1: rebuild
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'master' on '1b84c2b'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
	both modified:   Formula/[e-mail]

no changes added to commit (use "git add" and/or "git commit -a")

[Shivam Mathur]

@leewillis77

Retap shivammathur/php

HOMEBREW_DEVELOPER=1 brew untap shivammathur/php
brew tap shivammathur/php