git

Working with upstream repos

Shows how to pull updates from upstream repos while making changes to your down stream repo

Rebasing vs Merging Repos

Shows the differences between merging branches and rebase a branch onto another

Git flow

Describes how you should use Git flow and branching to manage your repositories