Add a note about rebasing to CONTRIBUTING.rst