From: Sverre Rabbelier <srabbelier@gmail.com>
To: Johannes Schneider <mailings@cedarsoft.com>
Cc: git <git@vger.kernel.org>
Subject: Re: Push to origin failed
Date: Tue, 19 Jan 2010 16:05:40 +0100 [thread overview]
Message-ID: <fabb9a1e1001190705o5698e675med65ec8618befa8e@mail.gmail.com> (raw)
In-Reply-To: <4B55C48F.2090005@cedarsoft.com>
Heya,
On Tue, Jan 19, 2010 at 15:41, Johannes Schneider
<mailings@cedarsoft.com> wrote:
> ! [rejected] master -> master (non-fast forward)
There's your problem. You could solve it by instead doing 'git push
-f' (telling it to push even though it's not a fast-forward), but that
would make it hard for those downstream of that repository. So, read
up on 'fast-forwards' and why it's bad to push if it's not a
fast-forward, but mainly figure out why you have a fast-forward in the
first place. It could very well be that you need to fetch and merge
(or fetch and rebase) first.
--
Cheers,
Sverre Rabbelier
prev parent reply other threads:[~2010-01-19 15:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-19 14:41 Push to origin failed Johannes Schneider
2010-01-19 15:05 ` Sverre Rabbelier [this message]
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=fabb9a1e1001190705o5698e675med65ec8618befa8e@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=git@vger.kernel.org \
--cc=mailings@cedarsoft.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).