News for hackers. Stuff that matters.

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

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 ]