git/list[1] front-page[2] threads[3] people[4] search[5] about
 

I can never finish a push

From
MRMartin L Resnick <mresnick@bbn.com>
Date
Dec 23, 2011, 13:11 UTC
Message-ID
<4EF47DF3.9080809@bbn.com>
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.

Next: Thomas Rast
Message 1 of 5 in “I can never finish a push”
  1. Martin L ResnickDec 23, 2011
  2. Thomas RastDec 23, 2011
  3. demerphqDec 23, 2011
  4. Johannes SixtDec 23, 2011
  5. Andreas SchwabDec 23, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.