Friendly reminder to use git cherry-pick and git rebase instead of git merge

[Andrew Purtell]

We previously agreed to avoid merge commits appearing in our git history.

Found a merge commit on 0.98 branch.

Thanks!


-- 
Best regards,

   - Andy

Problems worthy of attack prove their worth by hitting back. - Piet Hein
(via Tom White)