@TonyBologni I always rebase against the main
branch.

I sometimes squash into one commit, but in most cases I leave them as is (or do
some minor reorganization with rebase -i).