All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dragos Foianu <dragos.foianu@gmail.com>
To: git@vger.kernel.org
Subject: Re: push fail
Date: Mon, 17 Mar 2014 13:34:24 +0000 (UTC)	[thread overview]
Message-ID: <loom.20140317T142900-203@post.gmane.org> (raw)
In-Reply-To: CAH_OBie+KrSjtqLinbv8sJAOCu26j8xVzBQJHdHTB44V07GsXg@mail.gmail.com

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

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

  reply	other threads:[~2014-03-17 13:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-17 13:06 push fail shawn wilson
2014-03-17 13:34 ` Dragos Foianu [this message]
2014-03-18  1:58   ` shawn wilson
2014-03-17 13:36 ` Matthieu Moy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=loom.20140317T142900-203@post.gmane.org \
    --to=dragos.foianu@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.