Rebase vs. Merge

2014 May 10 git, merge, rebase, tips