https://medium.com/@porteneuve/getting-solid-at-git-rebase-vs-merge-4fa1a48c53aa#.std3ddz0ghttps://medium.com/@porteneuve/getting-solid-at
https://medium.com/@porteneuve/getting-solid-at-git-rebase-vs-merge-4fa1a48c53aa#.std3ddz0ghttps://medium.com/@porteneuve/getting-solid-at