Git: Merging the right way | Dark Hacker News