Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cloud
web
Commits
29ad4e57
Commit
29ad4e57
authored
7 years ago
by
Giuseppe Attardi
Browse files
Options
Downloads
Patches
Plain Diff
Update Local-Charm-Repository.rst
parent
a6ac4ba3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
web/support/kb/juju/Local-Charm-Repository.rst
+8
-1
8 additions, 1 deletion
web/support/kb/juju/Local-Charm-Repository.rst
with
8 additions
and
1 deletion
web/support/kb/juju/Local-Charm-Repository.rst
+
8
−
1
View file @
29ad4e57
...
@@ -68,6 +68,11 @@ and also create a branch::
...
@@ -68,6 +68,11 @@ and also create a branch::
Note: if the patch does not apply cleanly, you will need to manually
Note: if the patch does not apply cleanly, you will need to manually
resolve any conflicts to reapply the local customizations.
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::
If you made some changes to the master version that need to go into the stable branch::
$ git checkout stable/17.02
$ 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
...
@@ -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 commit -a
$ git push
$ 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
Releasing a new version of the charm
------------------------------------
------------------------------------
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment