summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-02-18 17:15:19 -0500
committerEvilSeph <evilseph@unaligned.org>2011-02-18 17:17:00 -0500
commit7b6713b9189c991fa88128451ef2144f749f5819 (patch)
tree5e43e39f1ee89c680a905d119cde45c6bd14a1ee
parent7fe0aa7460e73bfcf04efacaf1a1e63601774e8d (diff)
downloadcraftbukkit-7b6713b9189c991fa88128451ef2144f749f5819.tar
craftbukkit-7b6713b9189c991fa88128451ef2144f749f5819.tar.gz
craftbukkit-7b6713b9189c991fa88128451ef2144f749f5819.tar.lz
craftbukkit-7b6713b9189c991fa88128451ef2144f749f5819.tar.xz
craftbukkit-7b6713b9189c991fa88128451ef2144f749f5819.zip
Added pull request conventions that should be followed if you want your pull request accepted.
-rw-r--r--README.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/README.md b/README.md
index 11fe85df..096a89ff 100644
--- a/README.md
+++ b/README.md
@@ -13,13 +13,16 @@ We use maven to handle our dependencies.
* *Note*: this is not needed as the repository we use has Bukkit too, but you might have a newer one (with your own changes :D)
* Check out this repo and: `mvn clean package`
-Coding Conventions
+Coding and Pull Request Conventions
-----------
* We generally follow the Sun/Oracle coding standards.
* No tabs; use 4 spaces instead.
* No trailing whitespaces.
* No 80 column limit or 'weird' midstatement newlines.
+* The number of commits in a pull request should be kept to a minimum (squish them into one most of the time - use common sense!).
+* No merges should be included in pull requests unless the pull request's purpose is a merge.
+* Pull requests should be tested (does it compile? AND does it work?) before submission.
If you make changes or add net.minecraft.server classes it is mandatory to: