[Goodies-dev] Git

[Jannis Pohlmann]

On Thu, 17 Sep 2009 11:42:45 +1000
Simon Naunton <snaunton at gmail.com> wrote:

> So, I have my new git repo:
> 
> git.xfce.org/git/panel-plugins/xfce4-iicapn-plugin
> 
> I have my local git repo and from it's root dir I:
> 
> $ git remote add origin
> ssh://snaunton@git.xfce.org/git/panel-plugins/xfce4-iicapn-plugin
> $ git push origin master
> 
> Enter passphrase for key '/path/to/.ssh/id_dsa':
> Counting objects: 20, done.
> Compressing objects: 100% (16/16), done.
> Writing objects: 100% (20/20), 29.14 KiB, done.
> Total 20 (delta 1), reused 0 (delta 0)
> Non-fast forward update not allowed for master branch.
> error: hooks/update exited with error code 1
> error: hook declined to update refs/heads/master
> To ssh://snaunton@git.xfce.org/git/panel-plugins/xfce4-iicapn-plugin
>  ! [remote rejected] master -> master (hook declined)
> error: failed to push some refs to
> 'ssh://snaunton@git.xfce.org/git/panel-plugin s/xfce4-iicapn-plugin'
> 
> Can anyone help?

Try "git pull --rebase" before you try to push. If that still doesn't
work, ask Brian. He knows is way around this fast forward stuff better
than I do.

  - Jannis
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://mail.xfce.org/pipermail/goodies-dev/attachments/20090917/c868e4b6/attachment.pgp>