> Have you never used rebase or cherry-pick?

Of course. And when I forget how to do it, I ask Google, or ChatGPT. It works for me.