Today I was surprised to learn another new thing about git: A commit in git can have more than two parents. Such a commit is the result of an octopus merge, which is nicely explained in https://www.freblogg.com/git-octopus-merge . I laughed out loud in the office reading this great blog article. 😄
#TodayILearned #git
#TodayILearned #git
Understanding Git Octopus Merge
The Code for Git merge is one of the most sophisticated pieces of software ever written. There is so much stuff that goes inside during a merge that its just mind boggling. Just for that alone, Linus could be considered a programming genius. Too bad for other geniuses, he also …