Move Rebasing section from README.md to CONTRIBUTING.md
Merge pull request #6403 from robschmuecker/readme-fix-1

Move Rebasing section from README.md to CONTRIBUTING.md