From b60c5e5fe98d263c5ca2616529fefbb63b4d5811 Mon Sep 17 00:00:00 2001
From: David Thompson <davet@gnu.org>
Date: Tue, 26 Aug 2014 10:43:34 -0400
Subject: [PATCH] Add more notes about git workflow to README.

---
 2015/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/2015/README.md b/2015/README.md
index ec1728d9..5573ad51 100644
--- 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
 ------------------
 
-- 
2.25.1