Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on Distrusting git. Parent comment
"If any of the remote changes overlap with local uncommitted changes, the merge will be automatically cancelled and the work tree untouched"
"If any of the remote changes overlap with local uncommitted changes, the merge will be automatically cancelled and the work tree untouched"