Re: Git help

[Johannes Schindelin]

Hi,

On Sun, 28 Jan 2007, Rune Zedeler wrote:

> Trying to get a copy of jneemans branch to try out the new page breaking and
> score stretching stuff.
> 
> I clone the repository with
> 
> $ git clone git://git.sv.gnu.org/lilypond.git
> 
> Then I create .git/remotes/jneem containing
> 
> URL: git+ssh://address@hidden/srv/git/lilypond.git
> Push: refs/heads/jneeman:refs/heads/jneeman
> Pull: refs/heads/jneeman:refs/heads/jneeman
> 
> But when I then do
> 
> $ git pull jneem
> 
> I get conflicts in lily/page-breaking.cc and lily/text-spanner-engraver.cc
> 
> What do I do wrong?

You should first branch off of the jneeman branch (before pulling) with

        $ git checkout -b <branchname> jneeman

Hth,
Dscho