Stop cherry-picking, start merging, Part 1: The merge conflict


New top story on Hacker News: Stop cherry-picking, start merging, Part 1: The merge conflict