Update styleguide with new instructions for git merging

Frequent rebasing is no fun as it can lead to surprising results. I changed the guidelines for merging a bit.