Branching and Merging (Part 1)
June 12, 2018
Edward and Martin get caught up after the security release earlier this month and talk branching and merging, including how Git actually stores branches and does merging.
They got so excited about talking about branching that this is actually part one of two.
Microsoft and GitHub
Martin and Edward didn't discuss the announcement, since Edward can't talk intelligently about the subject yet. Every time the topic comes up, he just looks like this:
Since Edward can't be settled down to have a discussion, here's some news on the announcement:
- Microsoft Announces that it will Acquire GitHub
- A Bright Future for GitHub
- Hello, GitHub
- I'm Nat Friedman, Future CEO of GitHub. AMA.