diff --git a/web/support/kb/juju/Local-Charm-Repository.rst b/web/support/kb/juju/Local-Charm-Repository.rst index 56c36e3fbc784a2a4e1f30cb7293d9513c4213c5..e27bc77dde17369d246f5146e7daa1633aaf5e99 100644 --- a/web/support/kb/juju/Local-Charm-Repository.rst +++ b/web/support/kb/juju/Local-Charm-Repository.rst @@ -68,6 +68,11 @@ and also create a branch:: Note: if the patch does not apply cleanly, you will need to manually resolve any conflicts to reapply the local customizations. +Commit and push the new version of the charm:: + + $ git commit -a + $ git push + If you made some changes to the master version that need to go into the stable branch:: $ git checkout stable/17.02 @@ -75,7 +80,9 @@ If you made some changes to the master version that need to go into the stable b $ git commit -a $ git push -Commit and push the new version of the charm. +Then revert to master:: + + $ git checkout master Releasing a new version of the charm ------------------------------------