Go offline with the Player FM app!
Branching and Merging (Part 1)
Manage episode 208472390 series 1749423
![](https://www.allthingsgit.com/episodes/images/branching_and_merging.png)
![](images/branching_and_merging.png)
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.
Show Notes
- Git Branching: What a Branch Is from the Pro Git book
- Inside Git, an explanation from TechDays NL 2017
21 episodes
Manage episode 208472390 series 1749423
![](https://www.allthingsgit.com/episodes/images/branching_and_merging.png)
![](images/branching_and_merging.png)
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.
Show Notes
- Git Branching: What a Branch Is from the Pro Git book
- Inside Git, an explanation from TechDays NL 2017
21 episodes
All episodes
×Welcome to Player FM!
Player FM is scanning the web for high-quality podcasts for you to enjoy right now. It's the best podcast app and works on Android, iPhone, and the web. Signup to sync subscriptions across devices.