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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html