[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Git help
|
From: |
Rune Zedeler |
|
Subject: |
Git help |
|
Date: |
Sun, 28 Jan 2007 08:37:54 +0100 |
|
User-agent: |
Thunderbird 1.5.0.9 (X11/20070104) |
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?
-Rune
- Git help,
Rune Zedeler <=