Add more notes about git workflow to README.

diff --git a/2015/README.md b/2015/README.md
index ec1728d9d5fe99dce432b6daf8c87d7fc4361183..5573ad51978b4ba96278f101331d66ad318ff5ab 100644 (file)
--- a/2015/README.md
+++ b/2015/README.md
@@ -116,6 +116,19 @@ servers.  When you push to the `master` branch, the site is deployed
 to <http://wiki-dev0.libreplanet.org>.  When you push to the
 `stable` branch, the site is deployed to <http://libreplanet.org>.
 
+When you're happy with the state of the master branch and want to
+deploy live, do the following:
+
+```
+git checkout stable
+git merge master
+git push
+```
+
+This merges the master branch with the stable branch, updates the
+remote repository on the git server, and triggers a deploy to
+<http://libreplanet.org>.
+
 CSS and JavaScript
 ------------------