From: Johannes Sixt <j.sixt@viscovery.net>
Date: Fri, 23 Dec 2011 14:39:10 GMT
Subject: Re: I can never finish a push
Message-ID: <4EF4928E.4090306@viscovery.net>
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