Re: push fail

From: Dragos Foianu <dragos.foianu@gmail.com>
Date: Mar 17, 2014, 13:34 UTC
Message-ID: <loom.20140317T142900-203@post.gmane.org>
In-Reply-To: <CAH_OBie+KrSjtqLinbv8sJAOCu26j8xVzBQJHdHTB44V07GsXg@mail.gmail.com>

shawn wilson <ag4ve.us <at> gmail.com> writes:

Show 8 quoted lines

> 
> How do I get more info here (and hopefully resolve this)?
> 
>  % git push
> To ssh://server/foo/repo.git
>  ! [rejected]        test -> test (non-fast-forward)
> error: failed to push some refs to 'ssh://server/foo/repo.git'
>

"non-fast-forward" means that someone else pushed to branch test before you did and your push would end up overwriting their changes. Make sure you merge your local branch with the remote branch:

git pull origin test

It might also be a result of local destructive changes made by "git rebase". If you're absolutely certain you will not mess up the remote branch you can add the "--force" parameter when you push.