Re: Approach for collaborative branches

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Dec 6, 2009, 17:15 UTC
Message-ID: <vpqhbs4f2gz.fsf@bauges.imag.fr>
In-Reply-To: <4B1BE266.2000208@pickrell.com>

Gary Pickrell <gary@pickrell.com> writes:

Show 7 quoted lines

> 1) Clone the repository on Ubuntu
> 2) Made an Ubuntu branch
> 3) Made my changes to the code.  Added files...ect
> 4) Used git push origin Ubuntu to push the changes to the repository
>
> I'm unable to see my Ubuntu changes on my windows machine.  How should
> I proceed?

On the windows machine, you should do first

  git fetch

this will tell you about the new branch if you didn't fetch it already. If it's called Ubuntu remotely, it's probably called origin/Ubuntu on your local repository after doing a fetch. Therefore, you can now do

  git merge origin/Ubuntu

Now, you probably also want your local branch to be named the same way on both machines. One way to do that is to create a branch "foo" on the repository, then on both sides, fetch it and do

  git checkout --track origin/foo

this will create a local branch foo, and tell git that further "pull" should take their changes from origin/foo.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/