I mean, git lends itself to a lot of approaches, the ultimate goal is that the master repo's main branch has a readable and logical set of commit messages usefully describing every change.

Personally I try to avoid merge commits these days, although that's more of a habit than any reasoned position, as such I make frequent use of rebase/squash to edit previous commit messages. Is that worrying about clean commits?