Revolutionary-Games/Thrive — pull request #69 by Nimbal (2013-11-08 21:15:28+00:00)
Title: 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.