Ask HN: Git merge vs. rebase, when and how? | Dark Hacker News