Git team workflows: merge or rebase? | Dark Hacker News