diff --git a/paper-server/README.md b/paper-server/README.md
index 11fe85dfb3..096a89ff7e 100644
--- a/paper-server/README.md
+++ b/paper-server/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: