git pull: merge vs rebase | nelsonsloghttps://nelsonslog.wordpress.com/2014/12/31/git-pull-merge-vs-rebase/ todo_git todo_git