On 23 December 2011 14:11, Martin L Resnick <mresnick@xxxxxxx> wrote: > 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. > Apparently there is fast and furious development > on the branch I'm on that during my 15 seconds > of pushing someone else on-site pushes and adds > new commits before mine can finish. > > Is there anyway to lock the repository while > my push is going on ? > > Please don't ask why I have a slow line > or why the volume of changes that I am pushing. > Suffice it to say its military work. Maybe try pushing a branch and then having a colleague with a faster connection do the merge for you. yves -- perl -Mre=debug -e "/just|another|perl|hacker/" -- 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