This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git
commit b5a9d0005dd71e43513ce5009b15841b7d611b56 Author: Daan Hoogland <[email protected]> AuthorDate: Wed Feb 21 10:40:25 2024 +0100 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
