Git merges can be hard | Hacker News Reader