[GNUnet-SVN] [taler-deployment] branch master updated: Explain how to upgrade stable to master.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new baa8833  Explain how to upgrade stable to master.
baa8833 is described below

commit baa8833cff8c8c3926638900cc5d5c04052679f8
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Jun 10 15:29:48 2019 +0200

    Explain how to upgrade stable to master.
---
 doc/onboarding.texi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/onboarding.texi b/doc/onboarding.texi
index cde5843..e0d3dc4 100644
--- a/doc/onboarding.texi
+++ b/doc/onboarding.texi
@@ -177,7 +177,33 @@ Switch now to the color just built:
 $ taler-deployment-switch-<demo/test>-<blue/green>
 @end example
 
+@section How to upgrade the code.
 
+Some repositories, especially the ones from the released components,
+have a @emph{stable} branch, that keeps older and more stable code.
+Therefore,  upon each release we must rebase those stable branches
+on the master.
+
+The following commands do that:
+
+@example
+$ cd $REPO
+
+$ git pull origin master stable
+$ git checkout stable
+
+# option a: resolve conflicts resulting from hotfixes
+$ git rebase master
+$ ...
+
+# option b: force stable to master
+$ git update-ref refs/heads/stable master
+
+$ git push # possibly with --force
+
+# continue development
+$ git checkout master
+@end example
 
 @node Standalone deployment
 @chapter Standalone deployment

-- 
To stop receiving notification emails like this one, please contact
address@hidden.