Comment by zegl

`rebase` is simpler than `merge` in larger teams/projects, as the history will be much cleaner.