You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by da...@apache.org on 2024/03/08 15:57:52 UTC

(cloudstack-www) branch staging-site updated: Main alignment (#185)

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 a334d7cfb Main alignment (#185)
a334d7cfb is described below

commit a334d7cfb9c79d162ee439ead73598184577bd98
Author: dahn <da...@onecht.net>
AuthorDate: Fri Mar 8 16:57:47 2024 +0100

    Main alignment (#185)
    
    * ff-only
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 62c991569..453987023 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,8 @@ git checkout staging-site
 git pull
 # git clean -d or similar if needed
 git checkout main
-git merge staging-site
+git pull
+git merge --ff-only staging-site
 git push
 ```
 - wait for asf-site to be updated and publised to the main site