Git: branching and merging(softwarecave.org)

http://softwarecave.org/2014/03/30/git-branching-and-merging/