Re: push rejected (non-fast-forward)

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"