I can recommend rebasing when working in a team. Keeps the history so much cleaner!
Additionally, in my team, we use a lot of fixup (squash the commit but keep the message) and reword (change the commit message but keep the content) when doing interactive rebasing. Both are very valuable prior to push or merge.
What's the difference between rebase and merge with master?
Atlassian has this covered better than I could put in words. Read on!
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.