Git best practices: use rebase instead of merge

Read this article.