This is an automated email from the ASF dual-hosted git repository.
swill pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git
The following commit(s) were added to refs/heads/master by this push:
new 32e35a0 fixed a problem with the git instructions
32e35a0 is described below
commit 32e35a0a28df536ea42ca0fd50599e437e6b48ba
Author: Will Stevens <[email protected]>
AuthorDate: Tue Jul 11 10:03:50 2017 -0400
fixed a problem with the git instructions
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 8d9c801..8174c4d 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ NOTE: The content of the `build` directory needs to be copied
to the `content` i
```bash
git checkout master
git fetch upstream
-git rebase master upstream/master
+git pull upstream master
```
@@ -91,7 +91,7 @@ Once the PR has been merged into `master`, do the following
to publish the conte
```bash
git fetch upstream
git checkout master
-git rebase master upstream/master
+git pull upstream master
./build.sh # updates the content directory
middleman server [-p <portnumber>]
# visually validate changes at: http://localhost:[portnumber]
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
