It’s not rebase vs merge, it’s rebase AND merge.

Commit your changes into logical commits as you go.

Then just before submitting a pull request, review your own code. That includes reviewing your own commits too, not just the code diff.

Use rebase to:

• Swap commits so that related changes are together
• Edit your commit messages if you find a mistake or now have a better idea of what to put in your messages
• Drop any useless commits that you just end up reverting later
• Squash any two commits together where the first was the meat of desired change and the second was the one thing that you forgot to add to that commit so you immediately followed it up with another commit for that one missing thing.

Then, and only then, after you have reviewed your own code and used rebase to make the git history easier to read (and thus make it easier to review), then you can submit a pull request.

It’s correct that rebase rewrites history, but it’s important to identify when it’s not acceptable. If you are working on a branch that is shared by others (typically main), you should never use rebase. But it’s an acceptable practice when used properly. I use rebase on my feature branches whenever necessary. If it fell behind the main branch I do git fetch followed by git rebase origin/main, resolve the merge conflicts and keep coding. I also use interactive rebase when I need to tidy things up before merging the feature branch to main.

I rebase my dev branches on main to get rid of garbage commit messages due to me being lazy.

Squash and merge PRs into main, no merge commits allowed.

I think there are reasonable arguments for allowing rebase and merge to main, but it often doesn’t apply for me.

Merge commits in main will break a lot of out of the box GitOps tools.