Lesson Request: The life cycle of a feature branch

[nickisnoble]

Learn when to branch, how to fetch external changes, submit pull requests, deal with merge conflicts, and possibly look at rebasing