Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on Stop cherry-picking, start merging, Part 1: The merge conflict. Parent comment
Although you still fix the conflicts each time, it means you don't have many merge commits as you go along
There are no comments on this comment yet.
Although you still fix the conflicts each time, it means you don't have many merge commits as you go along