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.
On 23 December 2011 14:11, Martin L Resnick [off-list ref] 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/"
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