I find it more straightforward and less error-prone to suggest merge as the default strategy. Team-members who are very comfortable with git can use rebase for a cleaner history. The problems with making rebase the default policy are:
That said I like doing rebase myself in many situations.
We’re a place for programmers to stay up-to-date, learn new skills, and share ideas.
We’ll never post without your permission.