Github user dlaboss commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215711729
I had gotten myself into a similar situation recently. Wasn't quite sure
how I got where I did. In your case you can see that build.sh says your
asf-site was behind -- presumably because someone else, like me :-), did the
build.sh/push since the last time you did.
I'm getting the feeling build.sh should be ensuring your asf-site is up to
date early on. I think the following will do it:
```
$ git fetch asfclone asf-site
$ git checkout asf-site
$ git rebase asfclone/asf-site
```
I wimped out, simply blew away / recreated my asfclone, and then did the
build.sh/push again.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
