Beginning Git, Episode 10: Merging | Kodeco

[samdavies]

---

This is a companion discussion topic for the original entry at https://www.kodeco.com/4418-beginning-git/lessons/10