Git team workflows: merge or rebase?
blogs.atlassian.com
blogs.atlassian.com
On my personal project or when I'm the only person working on a branch, I only ever rebase, since that's easy to do and I like my tree clean. In a team environment though when you have different people contributing to a branch, merge might be preferable just because the branch can get screwed up if not everyone on the team is on the same page. I would probably only rebase right before merging into master and only do merges before that.