Another solution to this situation is to squash your changes in place so that your branch is just 1 commit, and then do the rebase against your master branch or equivalent.
Works great if you’re willing to lose the commit history on your branch, which obviously isn’t always the case.
I’m pretty sure @[email protected] has said before what he uses. I thought back in the day it was publicly listed with the expenses, but I couldn’t find it.
The most recent update I found was here: https://lemmy.world/post/75556
But it could definitely be old information, I’d take the other commenter’s advice and ask in the admin channel to be sure.