summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-13 14:03:58 -0700
committerCorey Hulen <corey@hulen.com>2015-10-13 14:03:58 -0700
commit998b5f7e11ac07a482e88f5d3ef4fd726cf0c99a (patch)
tree8950c586f90b64f67997e07622afab81fb25dabc /doc
parent1dfffacc3170290836f7159df34f33861e09245f (diff)
parent8f5a73705cbf2fd5773d7a4f74cc12f5d6f0f1bb (diff)
downloadchat-998b5f7e11ac07a482e88f5d3ef4fd726cf0c99a.tar.gz
chat-998b5f7e11ac07a482e88f5d3ef4fd726cf0c99a.tar.bz2
chat-998b5f7e11ac07a482e88f5d3ef4fd726cf0c99a.zip
Merge pull request #1034 from mattermost/PRs-to-master
Clarifying PRs should go to master
Diffstat (limited to 'doc')
-rw-r--r--doc/developer/Code-Contribution-Guidelines.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/developer/Code-Contribution-Guidelines.md b/doc/developer/Code-Contribution-Guidelines.md
index 453c154f9..48bbf2491 100644
--- a/doc/developer/Code-Contribution-Guidelines.md
+++ b/doc/developer/Code-Contribution-Guidelines.md
@@ -35,11 +35,11 @@ git checkout -b <branch name>
1. Please add yourself to the Mattermost [approved contributor list](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true) prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/).
-2. When you submit your pull request please include the Ticket ID at the beginning of your pull request comment, followed by a colon.
+2. When you submit your pull request please make it against `master` and include the Ticket ID at the beginning of your pull request comment, followed by a colon.
For example, for a ticket ID `PLT-394` start your comment with: `PLT-394:`. See [previously closed pull requests](https://github.com/mattermost/platform/pulls?q=is%3Apr+is%3Aclosed) for examples.
-3. Once submitted, your pull request will be checked via an automated build process and will be reviewed by the Mattermost core team, who may either accept the PR or follow-up with feedback.
+3. Once submitted, your pull request will be checked via an automated build process and will be reviewed by at least two members of the Mattermost core team, who may either accept the PR or follow-up with feedback. It would then get merged into `master` for the next release.
4. If you've included your mailing address in Step 1, you'll be receiving a [Limited Edition Mattermost Mug](http://forum.mattermost.org/t/limited-edition-mattermost-mugs/143) as a thank you gift after your first pull request has been accepted.