@@ -136,24 +136,23 @@ Committers!
 
 With great power comes great responsibility yada yada yada:
 
- * Code is peer reviewed, you should (almost) never push your own code.
- * Please don't accidentally force push to master.
- * Cherry Pick / Rebase commits, **don't use the big green button**, see below for instructions on how to
+ * Code is peer reviewed, you should not merge un-reviewed code.
+ * Pushing to `master` is blocked by GitHub.
+ * Cherry Pick / Rebase commits, **don't use merge commits**, see below for instructions on how to
  merge a pull request.
  * Ensure reviewed code follows the above contribution guidelines, if it doesn't feel free to amend and make note.
  * Please try to watch when Pull Requests are made and review and / or commit them in a timely manner.
  * After you merge in a patch use tin to update the version accordingly. Run `tin -v x.x.x-prerelease` with x.x.x being the previous version upgraded appropriately via semver. When we are ready to publish to npm we can remove the `-prerelease`.
  * Thanks, you are all awesome human beings.
 
 **How to merge a pull request**
- * Go to the pouchdb repository on your machine
- * Get the link to the patch of the pull request, which can be found under 'view command line instructions'
- next to the green 'Merge pull request' button on the page on GitHub for the pull request
- * In your command line, run the following:
-    * `curl https://patch-diff.githubusercontent.com/raw/pouchdb/pouchdb/pull/[PATCH NUMBER].patch | git am - && git push origin master`, replacing [PATCH NUMBER] with the number of the patch you want to merge.
- * Close the pull request once it has been merged, so no-one accidentally tries to merge it themselves
- * Make sure the issue associated with the pull request is closed, if the issue was resolved by that pull
- request
+  * Use the github Pull Request UI.
+  * Generally, use _Squash and merge_.
+  * In special circumstances, _Rebase and merge_ may be used.  It may be appropriate where intermediate commits in a pull request:
+    * meet standard requirements for commit messages; and
+    * are important for future understanding of a sequence of related changes; and
+    * cannot be broken down into separate pull requests.
+  * Make sure the issue associated with the pull request is closed, if the issue was resolved by that pull request.
 
 Release Procedure
 -----------------