Re: push rejected (non-fast-forward)

2014-11-25 Thread debugging data
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? htt

Re: push rejected (non-fast-forward)

2014-11-25 Thread Junio C Hamano
debugging data writes: > $ git push origin so-much-foo > To g...@github.com:user-two/project.git > ! [rejected]so-much-foo -> so-much-foo (non-fast-forward) > error: failed to push some refs to 'g...@github.com:user-two/project.git' > hint: Updates were rejected because the tip of your c

push rejected (non-fast-forward)

2014-11-25 Thread debugging data
Changes to a remote branch causes a user not to be able to push their changes because their tip is behind its remote counterpart. Here are the git repos: github.com/user-one/project github.com/user-two/project Here's what happened: 1. user-one creates a project and adds file-one.txt to the rep