diff --git a/docs/en/misc/contributing/index.md b/docs/en/misc/contributing/index.md index 19999fbbb..7c7a84af9 100644 --- a/docs/en/misc/contributing/index.md +++ b/docs/en/misc/contributing/index.md @@ -32,6 +32,7 @@ With great power comes great responsibility, so we have agreed on certain expect * Only merge code you have tested and fully understand. If in doubt, ask for a second opinion. * Ensure contributions have appropriate [test coverage](/topics/testing), are documented, and pass our [coding conventions](/misc/coding-conventions) * Keep the codebase "releasable" at all times (check our [release process](/misc/release-process)) - * API changes and non-trivial features should not be merged into release branches + * API changes and non-trivial features should not be merged into release branches. + * API changes on master should not be merged until they have the buy-in of at least two core committers (or better, through the [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)) * Avoid `git push --force`, and be careful with your git remotes (no accidental pushes) * Use your own forks to create feature branches \ No newline at end of file