(cloudstack-www) branch staging-site updated: enhancement/annotation of full publication procedure

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch staging-site
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git


The following commit(s) were added to refs/heads/staging-site by this push:
     new 3102a1d63 enhancement/annotation of full publication procedure
3102a1d63 is described below

commit 3102a1d6377180853b4247e5384c02112bd23968
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Fri Feb 16 13:48:01 2024 +0100

    enhancement/annotation of full publication procedure
---
 README.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ab4e7c952..62c991569 100644
--- a/README.md
+++ b/README.md
@@ -59,9 +59,18 @@ published to the 'asf-site'. see the procedure below.
 - merge
 - wait for the staged-site to be updated and published
 - check the staging site
-- pull the latest staging-site and main branches
-- merge staging-site to main
-- push main
+- next, on your local machine
+  - pull the latest staging-site and main branches
+  - merge staging-site to main
+  - push main
+```
+git checkout staging-site
+git pull
+# git clean -d or similar if needed
+git checkout main
+git merge staging-site
+git push
+```
 - wait for asf-site to be updated and publised to the main site
 - check again
 - go to sleep