update branching info

s0170071 · Oct 15, 2017 · 8d77c29 · 8d77c29
1 parent 77e5d8f
commit 8d77c29
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -17,11 +17,13 @@ Also there are more people on the forum that can help you with support.
  * Make sure your code compiles.
 
  * Make sure your code does not have warnings. (Warnings will be treated as errors by our Travis system.)
- 
+
  * Try to create different pull requests for different features/fixes.
 
  * Dont combine a lot of different stuff in one huge pull request.
 
+ * The v2.0 branch should get only fixes, new stuff should go into the mega-branch. (We will merge those fixes from v2.0 to mega)
+
  * Incomplete or unstable plugins should have a PLUGIN_BUILD_DEV #ifdef around them. Also add [DEVELOPMENT] to the name.
 
  * New plugins that seem to be working correctly should have a PLUGIN_BUILD_TESTING around until they are tested enough.