From: Johannes Sixt <j.sixt@viscovery.net>
To: Martin L Resnick <mresnick@bbn.com>
Cc: git@vger.kernel.org
Subject: Re: I can never finish a push
Date: Fri, 23 Dec 2011 15:39:10 +0100 [thread overview]
Message-ID: <4EF4928E.4090306@viscovery.net> (raw)
In-Reply-To: <4EF47DF3.9080809@bbn.com>
Am 12/23/2011 14:11, schrieb Martin L Resnick:
> I'm working remotely over a VERY slow line.
>
> When I do a push it starts out fine
> but after the 15 seconds it takes to push
> it fails with non-fast-forward merge.
>
> So I pull (no merge needed, its fast-forward)
> and try push again. Fails again.
>
> I can keep this up for hours on end;
> pushing, pulling, pushing, pulling.
Your statements can only make sense if the pushed branch generates a
"non-fast-forward" is not the same branch that you pull. Show a transcript
of your commands, and in particular also tell your setting of push.default.
-- Hannes
next prev parent reply other threads:[~2011-12-23 14:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-23 13:11 I can never finish a push Martin L Resnick
2011-12-23 14:18 ` Thomas Rast
2011-12-23 14:19 ` demerphq
2011-12-23 14:39 ` Johannes Sixt [this message]
2011-12-23 14:39 ` Andreas Schwab
-- strict thread matches above, loose matches on Subject: below --
2011-12-27 4:18 Bill Zaumen
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=4EF4928E.4090306@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=mresnick@bbn.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).