Re: [Gnumed-devel] Git pull request: template branch

[Karsten Hilbert]

On Tue, Jun 22, 2010 at 12:22:46PM +0200, Hilbert, Sebastian wrote:

> 
> On the way to learning git here is a pull request. I would like to see the 
> branch template included.
> 
> The project is GNUmed-shilbert @ gitorious.org
> Url is
> 
> address@hidden:gnumed-shilbert/gnumed.git
> 
> Let me know how this works out. 

So, what I've been doing with this information:

1) tell *my* local Git tree to know about his:

        git remote add basti-public address@hidden:gnumed-shilbert/gnumed.git

2) fetch his tree into mine:

        git fetch -v basti-public

I now have copies of his branches in my tree:

address@hidden:~/Projekte/gm-git/gnumed$ git branch -r
  basti-public/master
  basti-public/template
  origin/freediams
  origin/mac
  origin/master
  origin/ooo
  origin/rel-0-1-patches
  origin/rel-0-2-2-real
  origin/rel-0-2-3-patches
  origin/rel-0-2-4-patches
  origin/rel-0-2-5-patches
  origin/rel-0-2-6-patches
  origin/rel-0-2-7-patches
  origin/rel-0-2-8-patches
  origin/rel-0-2-patches
  origin/rel-0-3-patches
  origin/rel-0-4-patches
  origin/rel-0-5-patches
  origin/rel-0-6-patches
  origin/rel-0-7-patches
  origin/vacc

3) just to be safe:

        git checkout master
        git branch test-basti

4) test-merge his code:

        git checkout test-basti
        git merge basti-public/template

I now have his template branch merged with a copy of my master.

Karsten
-- 
GPG key ID E4071346 @ wwwkeys.pgp.net
E167 67FD A291 2BEA 73BD  4537 78B9 A9F9 E407 1346