Update docs to force us using rebase and not cherry-pick for merges (#486)