At work, we always generate 2 commits when merging a PR. The first one would be a commit for a feature and a separate commit for the merge.
Personally, I find having merge commits would clutter the git log. So I wonder what's the convention or best practices for this?