From be9dd4b28e05ed5ec9593d100f6dbdd8357193e3 Mon Sep 17 00:00:00 2001 From: Ian Hickson Date: Thu, 13 Jul 2017 10:23:29 -0700 Subject: [PATCH] Remove mention of directly landing on master (#11190) It's probably too much of a foot gun. Also, emphasize what you have to do in case people didn't read the design principles document. --- CONTRIBUTING.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5a566170d3..58fc585d9a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -167,13 +167,15 @@ To send us a pull request: Please make sure all your checkins have detailed commit messages explaining the patch. -Once you've gotten an LGTM from a project maintainer, submit your changes to the -`master` branch using one of the following methods: +Once you've gotten an LGTM from a project maintainer and once your PR has received +the green light from all our automated testing (Travis, Appveyor, etc), and once +the tree is green (see the [design principles](https://flutter.io/design-principles/) +document for more details), submit your changes to the `master` branch using one of +the following methods: * Wait for one of the project maintainers to submit it for you. * Click the green "Merge pull request" button on the GitHub UI of your pull request (requires commit access) -* `git push upstream name_of_your_branch:master` (requires commit access) You must complete the [Contributor License Agreement](https://cla.developers.google.com/clas).