I always prefer rebasing the feature branch first, then merging. It allows for a simpler linear repo history (this is if I'm the only one working on it).
I also like to clean it up with some commit squashing with: git rebase -i HEAD~n.
git rebase -i HEAD~n
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.