I use rerere on all git installations, it's a massive time saver. On the very rare occasion I do want to squash a single commit onto the branch HEAD, I use the same workflow as yourself. Using rebase for that workflow as described in the article isn't necessary IMO.

For anyone wondering what that command would look like:

git fetch

git merge origin/main

git reset --soft origin/main

git commit -m 'HN-1337 Awesome new feature'