From 97575369d14a7b6eb4b7891f9b31d518b4ded606 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 27 Sep 2016 16:30:13 +0200
Subject: protocol for stable->master

---
 deployment.rst | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'deployment.rst')

diff --git a/deployment.rst b/deployment.rst
index df8d433a..1918aeca 100644
--- a/deployment.rst
+++ b/deployment.rst
@@ -34,6 +34,24 @@ FIXME:  include instructions for other app stores
 Deploying to stable
 --------------------
 
+For all repositories that have a separate stable branch (currently exchange.git,
+merchant.git, merchant-frontends.git, bank.git, landing.git) do:
+
 .. code-block::
 
-  foo
+  cd $REPO
+  git pull
+  git checkout stable
+  
+  # option a: resolve conflicts resulting from hotfixes
+  git merge master
+  ...
+
+  # option b: force stable to master
+  git update-ref refs/heads/stable master
+
+  git push # possible with --force
+
+  # continue development
+  git checkout master
+
-- 
cgit v1.2.3