Re: [SOSlib-discuss] git branches

[Takeshi A. <ta...@fi...>]

Hi Rainer,

On Tue, 21 Jun 2011 15:12:32 +0200, Rainer Machne <ra...@tb...> wrote:
> I am trying to learn how the branching works at github. A strange thing
> is that we apparently did have - but never really used - branches before
> at the sourceforge CVS and they have been inherited.
> 
> Here is what I get from commandline:
> 
> erdling ~/programs/SBML_odeSolver.git> git branch
>   TBI
> * master
>   origin
>   physiomics
> 
> 
> So TBI is our institute, physiomics is the former workplace of Andrew
> Finney, I guess origin is the original branch I created?
> 
> But where is the Sundials branch? I didn't find anything here:
> http://book.git-scm.com/3_basic_branching_and_merging.html
The sundials branch is in the remote (i.e., github) repository.
Could you pull commits in the remote repository and rebase?
http://book.git-scm.com/3_distributed_workflows.html

In current situation the following command (pull-and-rebase)
may be enough:
$ git pull --rebase
BTW pull-and-merge is safer if we have more complicate case
in future.

With github's web interface you can look at the sundials branch:
https://github.com/raim/SBML_odeSolver/tree/sundials-2.4.0

Cheers,
-- Takeshi Abe