News for hackers. Stuff that matters.

A comment on Git cherry-pick and revert use 3-way merge. Parent comment

Re:Git cherry-pick and revert use 3-way merge by chx on Saturday November 11, 2023 @09:34AM (#38230607)
Not sure whether I count as a computer scientist, I only have a math teacher masters and half an information engineering degree, I dropped out.

Even knowing graph theory and understanding git I still don't have the shortest idea what https://eagain.net/articles/git-for-computer-scientists/git-... this even wants this to be.

[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by yencabulator on Saturday November 11, 2023 @11:12AM (#38231544)
A tree can point to other trees, making them subdirectories. A tree can point to blobs, making them files in that directory. File name, mode and such metadata is a property of the edge, and blobs themselves are nameless containers of bytes.
[ Parent | on HN ]