diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1a218a851..77fee57bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,16 +1,16 @@ #Contributing to the Optimizely JavaScript SDK -We welcome contributions and feedback! Please read the [README](README.md) to set up your development environment, then read the guidelines below for information on submitting your code. +We welcome contributions and feedback! All contributors must sign our [Contributor License Agreement (CLA)](https://docs.google.com/a/optimizely.com/forms/d/e/1FAIpQLSf9cbouWptIpMgukAKZZOIAhafvjFCV8hS00XJLWQnWDFtwtA/viewform) to be eligible to contribute. Please read the [README](README.md) to set up your development environment, then read the guidelines below for information on submitting your code. ## Development process -1. Create a branch off of `master`: `git checkout -b YOUR_NAME/branch_name`. +1. Create a branch off of `devel`: `git checkout -b YOUR_NAME/branch_name`. 2. Commit your changes. Make sure to add tests! 3. Run `npm run lint` to ensure there are no lint errors. 4. Run `webpack` to generate the built and minified file for those not installing via `npm` 5. `git push` your changes to GitHub. -6. Make sure that all unit tests are passing and that there are no merge conflicts between your branch and `master`. -7. Open a pull request from `YOUR_NAME/branch_name` to `master`. +6. Make sure that all unit tests are passing and that there are no merge conflicts between your branch and `devel`. +7. Open a pull request from `YOUR_NAME/branch_name` to `devel`. 8. A repository maintainer will review your pull request and, if all goes well, merge it! ##Pull request acceptance criteria