Hi folks, Looks like a merge commit was recently pushed to master. I think we have the project policy to not merge changes, but rather rebase any local changes onto an update from upstream.
The easiest way to avoid merge commits is to not use `git pull` but instead use `get fetch` followed by `rebase`. If you prefer to use just a single command, `git pull --rebase` will do the trick. More options are available here [0]. Thanks, Nick [0]: http://kernowsoul.com/blog/2012/06/20/4-ways-to-avoid-merge-commits-in-git/
