Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 01BF910544 for ; Wed, 25 Jun 2014 14:53:19 +0000 (UTC) Received: (qmail 66660 invoked by uid 500); 25 Jun 2014 14:53:18 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 66622 invoked by uid 500); 25 Jun 2014 14:53:18 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 66611 invoked by uid 99); 25 Jun 2014 14:53:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jun 2014 14:53:18 +0000 X-ASF-Spam-Status: No, hits=-2.8 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_HI,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of ldeluca@us.ibm.com designates 32.97.110.150 as permitted sender) Received: from [32.97.110.150] (HELO e32.co.us.ibm.com) (32.97.110.150) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jun 2014 14:53:14 +0000 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 25 Jun 2014 08:52:49 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 25 Jun 2014 08:52:47 -0600 Received: from b03cxnp07028.gho.boulder.ibm.com (b03cxnp07028.gho.boulder.ibm.com [9.17.130.15]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id BB07719D8026 for ; Wed, 25 Jun 2014 08:52:38 -0600 (MDT) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp07028.gho.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s5PEpOLG4587786 for ; Wed, 25 Jun 2014 16:51:24 +0200 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s5PEqlIJ024376 for ; Wed, 25 Jun 2014 08:52:47 -0600 Received: from d03nm133.boulder.ibm.com (d03nm133.boulder.ibm.com [9.63.34.21]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s5PEqlnt024370 for ; Wed, 25 Jun 2014 08:52:47 -0600 In-Reply-To: References: To: dev@cordova.apache.org MIME-Version: 1.0 Subject: Re: GitHub write access X-KeepSent: D60C9C58:20CF8B61-87257D02:005004AE; type=4; name=$KeepSent X-Mailer: IBM Notes Release 9.0 SHF141 June 05, 2013 From: Lisa Seacat DeLuca Message-ID: Date: Wed, 25 Jun 2014 10:52:44 -0400 X-MIMETrack: Serialize by Router on D03NM133/03/M/IBM(Release 9.0.1FP1HF1|April 25, 2014) at 06/25/2014 08:52:46 AM, Serialize complete at 06/25/2014 08:52:46 AM Content-Type: multipart/related; boundary="=_related 0051BD0385257D02_=" X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14062514-0928-0000-0000-000002F3658E X-Virus-Checked: Checked by ClamAV on apache.org --=_related 0051BD0385257D02_= Content-Type: multipart/alternative; boundary="=_alternative 0051BD0385257D02_=" --=_alternative 0051BD0385257D02_= Content-Type: text/plain; charset="US-ASCII" Ah, okay. I was hoping I'd be able to use the simple GitHub UX to quickly push a button to merge in my changes. :P I followed the instructions for the command line github push here: https://github.com/apache/cordova-coho/blob/master/docs/committer-workflow.md but it's not merging in my changes. Here's my console output, see anything I'm doing wrong? ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git branch * CB-6773cordova-plugin-vibration master ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git rebase master -i Successfully rebased and updated refs/heads/CB-6773cordova-plugin-vibration. ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git checkout master Switched to branch 'master' ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git merge --ff-only CB-6773cordova-plugin-vibration Updating 41ca0aa..74bc457 Fast-forward doc/de/index.md | 49 ++++++++++++++++++++++++------- doc/es/index.md | 49 ++++++++++++++++++++++++------- doc/fr/index.md | 51 +++++++++++++++++++++++++------- doc/ja/index.md | 49 ++++++++++++++++++++++++------- doc/ko/index.md | 49 ++++++++++++++++++++++++------- doc/pl/index.md | 47 ++++++++++++++++++++++++------ doc/ru/index.md | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/zh/index.md | 53 +++++++++++++++++++++++++-------- 8 files changed, 362 insertions(+), 72 deletions(-) create mode 100644 doc/ru/index.md ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git push Counting objects: 40, done. Compressing objects: 100% (15/15), done. Writing objects: 100% (24/24), 6.82 KiB, done. Total 24 (delta 11), reused 0 (delta 0) To ssh://git@github.com/ldeluca/cordova-plugin-vibration.git 41ca0aa..74bc457 master -> master ! [rejected] CB-6773cordova-plugin-vibration -> CB-6773cordova-plugin-vibration (non-fast-forward) error: failed to push some refs to 'ssh://git@github.com/ldeluca/cordova-plugin-vibration.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git pull Already up-to-date. ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git push To ssh://git@github.com/ldeluca/cordova-plugin-vibration.git ! [rejected] CB-6773cordova-plugin-vibration -> CB-6773cordova-plugin-vibration (non-fast-forward) error: failed to push some refs to 'ssh://git@github.com/ldeluca/cordova-plugin-vibration.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git status # On branch master nothing to commit (working directory clean) Here are my git remotes: ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git remote -v apache https://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration.git (fetch) apache https://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration.git (push) origin ssh://git@github.com/ldeluca/cordova-plugin-vibration.git (fetch) origin ssh://git@github.com/ldeluca/cordova-plugin-vibration.git (push) Thanks for your help, Lisa Lisa Seacat DeLuca Mobile Engineer | t: +415.787.4589 | ldeluca@apache.org | | ldeluca@us.ibm.com | lisaseacat.com | | From: Joe Bowser To: dev Date: 06/25/2014 10:30 AM Subject: Re: GitHub write access The Apache repositories on GitHub are read-only. The Apache Git repositories are located here: https://git-wip-us.apache.org/repos/asf I'm pretty sure you have commit access to these, but you'll have to merge in pull requests to here. Does anyone know the new method for closing them? Joe On Wed, Jun 25, 2014 at 7:26 AM, Lisa Seacat DeLuca wrote: > Can someone give me write access on github so I can merge in my pull > requests? I'm trying to do one for the vibration plugin for some > translations and it says only those collaborators with write access can do > a merge. > > Thanks! > > > Lisa > > Lisa Seacat DeLuca > Mobile Engineer | t: +415.787.4589 | *ldeluca@apache.org* > | | *ldeluca@us.ibm.com* | > *lisaseacat.com* | [image: follow > @LisaSeacat on twitter] | [image: > follow Lisa Seacat DeLuca on linkedin] > --=_alternative 0051BD0385257D02_= Content-Type: text/html; charset="US-ASCII" Ah, okay.  I was hoping I'd be able to use the simple GitHub UX to quickly push a button to merge in my changes.  :P

I followed the instructions for the command line github push here: https://github.com/apache/cordova-coho/blob/master/docs/committer-workflow.md  but it's not merging in my changes.  Here's my console output, see anything I'm doing wrong?

ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git branch
* CB-6773cordova-plugin-vibration
  master
ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git rebase master -i
Successfully rebased and updated refs/heads/CB-6773cordova-plugin-vibration.
ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git checkout master
Switched to branch 'master'
ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git merge --ff-only CB-6773cordova-plugin-vibration
Updating 41ca0aa..74bc457
Fast-forward
 doc/de/index.md |   49 ++++++++++++++++++++++++-------
 doc/es/index.md |   49 ++++++++++++++++++++++++-------
 doc/fr/index.md |   51 +++++++++++++++++++++++++-------
 doc/ja/index.md |   49 ++++++++++++++++++++++++-------
 doc/ko/index.md |   49 ++++++++++++++++++++++++-------
 doc/pl/index.md |   47 ++++++++++++++++++++++++------
 doc/ru/index.md |   87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/zh/index.md |   53 +++++++++++++++++++++++++--------
 8 files changed, 362 insertions(+), 72 deletions(-)
 create mode 100644 doc/ru/index.md
ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git push
Counting objects: 40, done.
Compressing objects: 100% (15/15), done.
Writing objects: 100% (24/24), 6.82 KiB, done.
Total 24 (delta 11), reused 0 (delta 0)
To ssh://git@github.com/ldeluca/cordova-plugin-vibration.git
   41ca0aa..74bc457  master -> master
 ! [rejected]        CB-6773cordova-plugin-vibration -> CB-6773cordova-plugin-vibration (non-fast-forward)
error: failed to push some refs to 'ssh://git@github.com/ldeluca/cordova-plugin-vibration.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git pull
Already up-to-date.
ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git push
To ssh://git@github.com/ldeluca/cordova-plugin-vibration.git
 ! [rejected]        CB-6773cordova-plugin-vibration -> CB-6773cordova-plugin-vibration (non-fast-forward)
error: failed to push some refs to 'ssh://git@github.com/ldeluca/cordova-plugin-vibration.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git status
# On branch master
nothing to commit (working directory clean)

Here are my git remotes:

ldeluca@ubuntu:~/git/cordova-plugin-vibration$ git remote -v
apache        https://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration.git (fetch)
apache        https://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration.git (push)
origin        ssh://git@github.com/ldeluca/cordova-plugin-vibration.git (fetch)
origin        ssh://git@github.com/ldeluca/cordova-plugin-vibration.git (push)

Thanks for your help,


Lisa
Lisa Seacat DeLuca
Mobile Engineer | t: +415.787.4589 | ldeluca@apache.org | | ldeluca@us.ibm.com | lisaseacat.com | follow @LisaSeacat on twitter| follow Lisa Seacat DeLuca on linkedin




From:        Joe Bowser <bowserj@gmail.com>
To:        dev <dev@cordova.apache.org>
Date:        06/25/2014 10:30 AM
Subject:        Re: GitHub write access



The Apache repositories on GitHub are read-only.  The Apache Git
repositories are located here:

https://git-wip-us.apache.org/repos/asf

I'm pretty sure you have commit access to these, but you'll have to merge
in pull requests to here.  Does anyone know the new method for closing
them?

Joe


On Wed, Jun 25, 2014 at 7:26 AM, Lisa Seacat DeLuca <ldeluca@us.ibm.com>
wrote:

> Can someone give me write access on github so I can merge in my pull
> requests? I'm trying to do one for the vibration plugin for some
> translations and it says only those collaborators with write access can do
> a merge.
>
> Thanks!
>
>
> Lisa
>
> Lisa Seacat DeLuca
> Mobile Engineer | t: +415.787.4589 | *ldeluca@apache.org*
> <ldeluca@apache.org> | | *ldeluca@us.ibm.com* <ldeluca@us.ibm.com> |
> *lisaseacat.com* <http://www.lisaseacat.com/> | [image: follow
> @LisaSeacat on twitter] <http://www.twitter.com/LisaSeacat>| [image:
> follow Lisa Seacat DeLuca on linkedin]
> <http://www.linkedin.com/in/lisaseacat>
--=_alternative 0051BD0385257D02_=-- --=_related 0051BD0385257D02_=--