Mailing-List: contact dev-help@quarks.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@quarks.incubator.apache.org
Date: Fri, 29 Apr 2016 00:45:13 +0000 (UTC)
From: "ASF GitHub Bot (JIRA)" <jira@apache.org>
To: dev@quarks.incubator.apache.org
Message-ID: <JIRA.12960865.1461263367000.65967.1461890713963@Atlassian.JIRA>
In-Reply-To: <JIRA.12960865.1461263367000@Atlassian.JIRA>
References: <JIRA.12960865.1461263367000@Atlassian.JIRA>
 <JIRA.12960865.1461263367068@arcas>
Subject: [jira] [Commented] (QUARKS-153) need doc to capture website
 consistency conventions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit


    [ https://issues.apache.org/jira/browse/QUARKS-153?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15263340#comment-15263340 ] 

ASF GitHub Bot commented on QUARKS-153:
---------------------------------------

Github user home4slc commented on the pull request:

    https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215602999
  
    I just merged this, but I got an odd error...
    
    Susans-MBP-318:incubator-quarks-website susancline$ sh build.sh
    Configuration file: /Users/susancline/git-wip-apache-docs/incubator-quarks-website/site/_config.yml
                Source: /Users/susancline/git-wip-apache-docs/incubator-quarks-website/site
           Destination: ../content_tmp
     Incremental build: disabled. Enable with --incremental
          Generating... 
                        done in 0.828 seconds.
     Auto-regeneration: disabled. Use --watch to enable.
    Switched to branch 'asf-site'
    Your branch is behind 'origin/asf-site' by 9 commits, and can be fast-forwarded.
      (use "git pull" to update your local branch)
    Committing changes to asf-site branch from master branch
    [asf-site 0304cdc] from e1bd198bfd0426a24e71b588db1775039fa9fc5d
     40 files changed, 4398 insertions(+), 166 deletions(-)
     create mode 100644 content/recipes/recipe_adaptable_deadtime_filter.html
     create mode 100644 content/recipes/recipe_adaptable_polling_source.html
     create mode 100644 content/recipes/recipe_dynamic_analytic_control.html
    You are now on the asf-site branch
    Run git push origin asf-site to update the live site.
    
    Susans-MBP-318:incubator-quarks-website susancline$ git push origin asf-site
    To https://git-wip-us.apache.org/repos/asf/incubator-quarks-website.git
     ! [rejected]        asf-site -> asf-site (non-fast-forward)
    error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/incubator-quarks-website.git'
    hint: Updates were rejected because the tip of your current branch is behind
    hint: its remote counterpart. Integrate the remote changes (e.g.
    hint: 'git pull ...') before pushing again.
    hint: See the 'Note about fast-forwards' in 'git push --help' for details.
    
    Susans-MBP-318:incubator-quarks-website susancline$ git push <-- my mistake, I did not read the error above
    To https://git-wip-us.apache.org/repos/asf/incubator-quarks-website.git
     ! [rejected]        asf-site -> asf-site (non-fast-forward)
    error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/incubator-quarks-website.git'
    hint: Updates were rejected because the tip of your current branch is behind
    hint: its remote counterpart. Integrate the remote changes (e.g.
    hint: 'git pull ...') before pushing again.
    hint: See the 'Note about fast-forwards' in 'git push --help' for details.
    
    Now I did a 'git pull' and I got this:
    
    Susans-MBP-318:incubator-quarks-website susancline$ git pull
    Merge made by the 'recursive' strategy.
    Susans-MBP-318:incubator-quarks-website susancline$ git status
    On branch asf-site
    Your branch is ahead of 'origin/asf-site' by 2 commits.
      (use "git push" to publish your local commits)
    Untracked files:
      (use "git add <file>..." to include in what will be committed)
    
    	_site/
    
    nothing added to commit but untracked files present (use "git add" to track)
    
    Can someone help me untangle this and tell me what I should do?
    Thanks, Susan


> 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)