This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-website.git
commit 202d80ada5fe446b9993dd9c49ddf1d69f4618fd
Author: mck <m...@apache.org>
AuthorDate: Fri Jul 24 11:24:12 2020 +0200
Update README.md with merge commands (to copy asf-staging to asf-site
branch) for cassandra.staged.a.o -> cassandra.a.o updates
---
README.md | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/README.md b/README.md
index a128f43..6f39a6c 100644
--- a/README.md
+++ b/README.md
@@ -71,3 +71,13 @@ $ docker-compose up cassandra-website-serve
```
For information about the site layout see the **Layout** section of
[README](src/README#layout) in the _src_ directory.
+
+Merging `asf-staging` to `asf-site`
+-----------------------------------
+
+Updating the main website, after verifying the staged website, involves
copying the `asf-staging` branch to `asf-site`. A normal git merge is not used,
because the `asf-staging` is forced updated after each ci-cassandra.apache.org
build. Instead make live the staged website by copying the `asf-staging` to the
`asf-site` branch.
+
+ git fetch origin
+ git switch asf-site
+ git reset --hard origin/asf-staging
+ git push -f origin asf-site
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
