commit baa8833cff8c8c3926638900cc5d5c04052679f8 parent b8f2b4f7581746599295af51d8fd4475953166e8 Author: Marcello Stanisci <stanisci.m@gmail.com> Date: Mon, 10 Jun 2019 15:29:48 +0200 Explain how to upgrade stable to master. Diffstat:
| M | doc/onboarding.texi | | | 26 | ++++++++++++++++++++++++++ |
1 file changed, 26 insertions(+), 0 deletions(-)
diff --git 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