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

Re: push rejected (non-fast-forward)

From
DDdebugging data <debugging.data@gmail.com>
Date
Nov 26, 2014, 00:16 UTC
Message-ID
<443C531A-FD94-40F2-B661-209F6327A1A0@gmail.com>
In-Reply-To
<xmqqsih7rsyu.fsf@gitster.dls.corp.google.com>
Thank you Junio.
Do you know how the
    $ git pull origin so-much-foo` 
command manages to keep user-two’s branch up-to-date with remote?
It seems counterintuitive since I am pulling from origin and not explicitly working with remote.
 
Would what you see here been an acceptable scenario?
https://github.com/user-one/project/pull/1
I performed a `git pull` and merged the changes manually. This looks like an awful lot to keep track of, and I’m not sure if it’s acceptable for larger projects.
My goal here is to prepare myself to help out with a large open source project.
Also, if anyone has the patience, would you mind explaining what’s going on here?
$ git show-branch FETCH_HEAD so-much-foo
! [FETCH_HEAD] changed foo/foo.txt contents to "so much foo"
 * [so-much-foo] foo/foo.txt from "so much foo" to "foo\nfoo"
Previous: Junio C Hamano
Message 3 of 3 in “push rejected (non-fast-forward)”
  1. debugging dataNov 25, 2014
  2. Junio C HamanoNov 25, 2014
  3. debugging dataNov 26, 2014

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.