From: "Shawn O. Pearce" <spearce@spearce.org>
To: Thomas Anderson <zelnaga@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: error: failed to push some refs
Date: Sat, 6 Mar 2010 18:18:49 -0800 [thread overview]
Message-ID: <20100307021848.GI2529@spearce.org> (raw)
In-Reply-To: <15b345f1003061815y52a4e842u9373731cecd8ec60@mail.gmail.com>
Thomas Anderson <zelnaga@gmail.com> wrote:
> I cloned git://github.com/symfony/symfony.git to C:/git/test-root and
> then cloned C:/git/test-root twice to C:/git/test-clone and
> C:/git/test-clone2. I modify the README file in C:/git/test-clone,
> stage it, commit it and then try to push it to C:/git/test-root and
> get this message:
>
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again. See the 'non-fast forward'
> section of 'git push --help' for details.
> Pushing to C:/git/test-root
> To C:/git/test-root
> ! [rejected] master -> master (non-fast forward)
> error: failed to push some refs to 'C:/git/test-root'
>
> What does that even mean?
Exactly what the message said to you:
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'non-fast forward'
section of 'git push --help' for details.
Someone else (your other clone) modified your project in the interim.
To prevent losing their change, you need to use `git pull` to bring
in their work, merge it with your own, and then you can push it to
the destination.
For more details, check the `git push` manpage section suggested
by the error message above.
--
Shawn.
next prev parent reply other threads:[~2010-03-07 2:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-07 2:15 error: failed to push some refs Thomas Anderson
2010-03-07 2:18 ` Shawn O. Pearce [this message]
2010-03-07 5:04 ` Thomas Anderson
2010-03-07 9:43 ` Dmitry Potapov
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=20100307021848.GI2529@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=zelnaga@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).