[
https://issues.apache.org/jira/browse/QUARKS-153?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15264049#comment-15264049
]
ASF GitHub Bot commented on QUARKS-153:
---------------------------------------
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.
> need doc to capture website consistency conventions
> ---------------------------------------------------
>
> Key: QUARKS-153
> URL: https://issues.apache.org/jira/browse/QUARKS-153
> Project: Quarks
> Issue Type: Bug
> Components: Documentation
> Reporter: Dale LaBossiere
> Assignee: Queenie Ma
> Priority: Minor
> Labels: newbie
>
> in the website repo, README.md or a new DEVELOPMENT.md needs to have a
> section to capture the decisions in QUARKS-104 so contributors can locate
> this info.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
