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

Re: I can never finish a push

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Dec 23, 2011, 14:39 UTC
Message-ID
<4EF4928E.4090306@viscovery.net>
In-Reply-To
<4EF47DF3.9080809@bbn.com>
Am 12/23/2011 14:11, schrieb Martin L Resnick:
Show 11 quoted lines
> 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
Previous: demerphqNext: Andreas Schwab
Message 4 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.