diff options
| author | it33 <iantien@gmail.com> | 2015-12-08 08:19:32 -0800 |
|---|---|---|
| committer | it33 <iantien@gmail.com> | 2015-12-08 08:19:32 -0800 |
| commit | a2f8c4cacaf25cfb0ded16a49a75494eb4bc5ed3 (patch) | |
| tree | 609f1045a68891316643d5c649677be50c5beb6e | |
| parent | a686bcc19af3b8a0a89abfb0f85cabeb65005e6e (diff) | |
| download | chat-a2f8c4cacaf25cfb0ded16a49a75494eb4bc5ed3.tar.gz chat-a2f8c4cacaf25cfb0ded16a49a75494eb4bc5ed3.tar.bz2 chat-a2f8c4cacaf25cfb0ded16a49a75494eb4bc5ed3.zip | |
Update overview.md
| -rw-r--r-- | doc/process/overview.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/process/overview.md b/doc/process/overview.md index a1201a8d6..57ddfb7ab 100644 --- a/doc/process/overview.md +++ b/doc/process/overview.md @@ -1,6 +1,6 @@ # Development Process Overview -This document describes the process through which feedback and design discussions flow into community systems, then into tickets, then into merge requests, then into monthly releases based on the purpose of the product. +This document describes the process through which feedback and design discussions flow into community systems, then into tickets, then into pull requests, then into monthly releases based on the purpose of the product. ## Purpose @@ -44,7 +44,7 @@ Please consider using more mainstream processes for [filing feature ideas to be ### GitHub Pull Requests -A system for submitting merge requests for changes to Mattermost. See [Merge Requests](https://github.com/mattermost/platform/blob/master/doc/process/overview.md#merge-requests) section below. +A system for submitting pull requests for changes to Mattermost. See [Pull Requests](https://github.com/mattermost/platform/blob/master/doc/process/overview.md#merge-requests) section below. ### General Forum @@ -80,7 +80,7 @@ Release planning sets the "Fix Version" of tickets to one of the upcoming monthl Tickets to be completed in the upcoming two weeks are organized on Tuesdays, with input from developers, and finalized on Fridays. -## Merge Requests +## Pull Requests ### Core Team Weekly Rhythm @@ -92,7 +92,7 @@ Key contributors might also pick up tickets, or through conversations with the c ### Community Contributions -Community members following the Contribution Guidelines might also submit pull requests. +Community members following the Contribution Guidelines might also submit pull requests. Pull requests should not disable existing functionality without a Jira ticket, which are opened [via the feature ideas process](http://www.mattermost.org/feature-requests/). #### Bug Fixes |