cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Lisa Seacat DeLuca <ldel...@us.ibm.com>
Subject Re: GitHub write access
Date Wed, 25 Jun 2014 16:20:42 GMT
Thank you Andrew!!  That did the trick. 



Lisa Seacat DeLuca
OmniChannel Mobile Development Engineer - Apache Cordova Committer - IBM 
Master Inventor
SWG Open Technologies and Cloud Performance

Phone: 1-410-332-2128 | Mobile: 1-415-787-4589
E-mail: ldeluca@us.ibm.com
personal website: lisaseacat.com
Chat: ldeluca@us.ibm.com 
Find me on:   and within IBM on:  


100 East Pratt St 21-2212
Baltimore, MD 21202-1009
United States




From:   Andrew Grieve <agrieve@chromium.org>
To:     dev <dev@cordova.apache.org>
Date:   06/25/2014 11:05 AM
Subject:        Re: GitHub write access
Sent by:        agrieve@google.com



Your push to master on your own github worked. It's just your
CB-6773cordova-plugin-vibration branch that didn't work. To update that
branch:
git checkout CB-6773cordova-plugin-vibration
git pull --rebase
git push origin CB-6773cordova-plugin-vibration


To merge your change into apache:
git checkout master
git pull apache master --rebase
git status # Make sure things are what you'd like them to be
git push apache master





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

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


Mime
  • Unnamed multipart/related (inline, None, 0 bytes)
View raw message