diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7337cb9..64d86073 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ If something is better suited to be a plugin for TShock, rather than a TShock co ### Pull Request Dev Guidelines -These guidelines are for all contributors. +These guidelines are for all contributors. Please join #pull-request on our Slack instance and ask about your idea first, if you're implementing a new feature, system, or changing an existing implementation. Pull requests that change large feature sets or swathes of code will be dissected for quality and purpose prior to approval, and requests that conflict with a team developer's work may be declined if the project is already being worked on internally, but not released. In addition, issues assigned to Nyx developers that are recent and fresh should be considered a no-go zone, while that developer works on their solution outside the scope of Github. Required: - Push code to the general-devel branch. Do not push it anywhere else. @@ -34,7 +34,7 @@ These guidelines are to be followed by all developers with commit level access t #### Pull Request Acceptance Guidelines -- Don't ruin someone's first time sending a pull request. They feel demotivated, and then they won't want to push any more code for us. +- Don't ruin someone's first time sending a pull request. They feel de-motivated, and then they won't want to push any more code for us. - Don't accept untested pull requests from the outside world. Bamboo and Travis will at least make sure that something compiles, but actual code and execution tests are required. - Pull request acceptance from internal contributors (anyone with write access) requires only one other approval to merge. - Pull request acceptance from external contributors (anyone without write access) requires the [two-man rule](https://en.wikipedia.org/wiki/Two-man_rule) to be followed. If another man/woman/child in the two-man rule cannot be found within seven days, then this requirement is exempted. diff --git a/README.md b/README.md index 86aa841b..8241f47b 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ Feeling like helping out? Want to find an awesome server? Some awesome plugins? * [Wiki](https://tshock.atlassian.net/wiki/display/TSHOCKPLUGINS/Home) * [Join our chat (supports IRC, XMPP, iOS, Android, Web)](http://chat.tshock.co/) +If your intention is to send a pull request or code change, please join #pull-request in Slack to discuss your changes with the team. For more contributing guidelines, see the contributing file. + ## Download * [Github Releases](https://github.com/TShock/TShock/releases)