diff options
Diffstat (limited to 'doc/onboarding.texi')
| -rw-r--r-- | doc/onboarding.texi | 26 |
1 files changed, 26 insertions, 0 deletions
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 |