diff options
| author | Florian Dold <florian.dold@gmail.com> | 2016-09-27 16:30:13 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2016-09-27 16:30:13 +0200 |
| commit | 97575369d14a7b6eb4b7891f9b31d518b4ded606 (patch) | |
| tree | aba60bc357f75c7114a55259149f827e5d28963e /deployment.rst | |
| parent | e34a0c23928d7e7d0bdd1dd75fb961f6212397a5 (diff) | |
| download | docs-97575369d14a7b6eb4b7891f9b31d518b4ded606.tar.gz docs-97575369d14a7b6eb4b7891f9b31d518b4ded606.tar.bz2 docs-97575369d14a7b6eb4b7891f9b31d518b4ded606.zip | |
protocol for stable->master
Diffstat (limited to 'deployment.rst')
| -rw-r--r-- | deployment.rst | 20 |
1 files changed, 19 insertions, 1 deletions
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 + |