I prefer to have every commit into the main branch be a merge. Work in your feature branch, do whatever you want, then use a single merge commit when it comes into the main branch. Then you can do a `git log --first-parent` and only see the merge commits. It gives a nice clean history and IF you need to dig down into the feature branch that was merged in, you still can!