diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 90f0ec7e4..61603b727 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,8 +17,9 @@ If you are uncertain about any part or need help please feel free to ask for hel ## Pull requests -* Your pull requests should target the develop branch, not master. Nothing will be directly merged into master! +* Your pull requests should target the master branch. * A pull request should be mergeable (fast-forward) if not, you will be asked to update it. * Ideally any change should include updated or new unittests to cover the changes. You can submit a PR without tests, but it will take longer to merge as someone else will need to fix the test coverage. * Solarium follows the Symfony2 code standards: http://symfony.com/doc/current/contributing/code/standards.html +* Each PR will be checked for code standards violations. Of course anything other than a 'green' status needs to be fixed before a PR can be merged. * Each PR will be checked by the CI environment automatically. Of course anything other than a 'green' status needs to be fixed before a PR can be merged.