On Wed, May 20, 2009 at 08:02:41AM -0600, Carl D. Sorensen wrote: > > > > On 5/19/09 11:58 PM, "Mark Polesky" <markpole...@yahoo.com> wrote: > > > > > > > Carl D. Sorensen wrote: > >>>> 3. git pull origin master > >>> From git://git.sv.gnu.org/lilypond > >>> * branch master -> FETCH_HEAD > >>> Already up-to-date. > >> > >> OK, this says everything is working just fine, so I don't know > >> why you are getting an error message from git gui. > >> > >> Looks to me like you're good to go. > > > > Except that I have no idea how this thing works. I'm happy to > > avoid the gui and stick with the bash (if I knew how), but the > > instructions in the CG don't seem to work. > > Which instructions in the CG don't work? (I'm not being defensive, I'm > trying to understand). > > You might try working with git gui by creating a local branch named "master" > instead of "lilypond-local". Given the results of your git pull commands, I > think that git gui doesn't know how to pull from origin/master into > local-lilypond. > > To create this branch, you'd do (I hope this is right): > > git branch master
This is right. > git checkout origin/master If you do this, a remote branch (origin/master) will be checked out, leaving you on a non-existent local branch. Instead, use $ git checkout master Or, you can combine the two commands: $ git checkout -b master HTH, Patrick _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel