From d4851b8e0f16d2dd10ae6881993ee500292eb020 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Tue, 5 May 2015 22:14:47 -0600 Subject: [PATCH] Add Github flow; fixes #924 --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 93824586..9292b0e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,6 +14,8 @@ If something is better suited to be a plugin for TShock, rather than a TShock co 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. +Even if you have write access to the repository, follow [Github flow](https://guides.github.com/introduction/flow/) when sending commits. Don't send commits directly to either ```master``` or ```general-devel``` unless those commits modify either the deploy scripts or non-code components. If it compiles, follow Github Flow. + Required: - Push code to the general-devel branch. Do not push it anywhere else. - Use tabs, not spaces.