Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on Portable Offline Open Street Map. Parent comment
With conflicts, best way to resolve is a human manually deciding how to merge (which part of commit A & which part(s) of commit B to include) :D
There are no comments on this comment yet.
With conflicts, best way to resolve is a human manually deciding how to merge (which part of commit A & which part(s) of commit B to include) :D