Add a blog post about when using merge/rebase in Git
Merge pull request #3 from kdisneur/feature/merge-or-rebase-that-is-the-question

Add a blog post about when using merge/rebase in Git