Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

It is possible for a git commit to have zero parents (initial commit), one parent (the direct ancestor in a linear path), two parents (generally referred to as a merge node) and more than two parents (also referred to as a merge but only possible using the octopus strategy).



Ah, of course, merge nodes have multiple parents.

I had never heard of octopus merges though. It's fascinating. Here[1] is the article I read on it.

[1] https://developer.atlassian.com/blog/2015/01/git-merge-disti...




Consider applying for YC's Fall 2025 batch! Applications are open till Aug 4

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: