7 ms·
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
by alblue 12y ago
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).
- scrollaway 12y agoAh, 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-distinct-octopus-merge/ https://developer.atlassian.com/blog/2015/01/git-merge-disti...