News for hackers. Stuff that matters.

A comment on Git Branches: Intuition and Reality. Parent comment

Re:Git Branches: Intuition and Reality by TeMPOraL on Thursday November 23, 2023 @12:43PM (#38395305)
> Disregarding merges for now.

Without disregarding them, it's not a tree, but a DAG.

[ Parent | on HN ]
Re:Git Branches: Intuition and Reality by dayjaby on Thursday November 23, 2023 @04:42PM (#38397900)
It is a tree. What makes you think it's just a DAG? Are there commits with multiple parent commits or what?
[ Parent | on HN ]
Re:Git Branches: Intuition and Reality by zaphar on Thursday November 23, 2023 @04:48PM (#38397939)
There absolutely can be. Merge commits have multiple parent commits for example. It's definitely a graph not just a tree.
[ Parent | on HN ]
Re:Git Branches: Intuition and Reality by dayjaby on Thursday November 23, 2023 @05:41PM (#38398479)
Parent comment was about disregarding merge commits.
[ Parent | on HN ]
Re:Git Branches: Intuition and Reality by zaphar on Thursday November 23, 2023 @07:21PM (#38399381)
You can't disregard merge commits. It's part of the structure.
[ Parent | on HN ]
Re:Git Branches: Intuition and Reality by imron on Thursday November 23, 2023 @04:47PM (#38397935)
Yes. Merge commits have two parents.
[ Parent | on HN ]
Re:Git Branches: Intuition and Reality by Izkata on Thursday November 23, 2023 @05:15PM (#38398205)
Two or more. I'm not sure there's a limit.

Try not to do this (imagine a 5-way merge conflict).

[ Parent | on HN ]