Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on Highlights from Git 2.35. Parent comment
It displays two diffs: one from the ancestral commit to “ours” and one from the ancestral commit to “theirs”. I find it helpful for understanding conflicts and how to resolve them — any feedback appreciated.
There are no comments on this comment yet.
It displays two diffs: one from the ancestral commit to “ours” and one from the ancestral commit to “theirs”. I find it helpful for understanding conflicts and how to resolve them — any feedback appreciated.