Re: Help with git and LilyPond Tutorial

[Johannes Schindelin]

Hi,

On Fri, 29 Dec 2006, Han-Wen Nienhuys wrote:

> Johannes Schindelin escreveu:
> > 
> > $ git fetch git://git.sv.gnu.org/lilypond.git/ web/master:web/master
> 
> IIRC, used to not work, until Linus changed this at my request.  Older 
> GIT versions may cause some trouble here.

IIRC you did a pull, not a fetch. And you were on the same local branch.

Note that "web/master:web/master" in this context really means "get what 
the remote side has as branch web/master, _and_ store it as the local 
branch web/master". The storing part is the part after the colon.

And there came the problem: your current branch already _was_ your local 
web/master, and you tried to store _and_ merge the remote branch into your 
local one.

The major confusion as I understand it now, was that the remote branch 
with the name "web/master" does not have to have any relation with your 
local branch with the name "web/master".

(Note: In the upcoming release of git, this is solved by introducing a 
branch name space for remote branches, i.e. you would not fetch 
web/master:web/master, but rather web/master:refs/remotes/web/master.)

Ciao,
Dscho