Git team workflows: is it better to merge or rebase? | Hacker News Reader