Francisco Vila <paconet....@gmail.com> writes: > 2011/12/31 Carl Sorensen <c_soren...@byu.edu>: >> I suspect that we gave you commands that set it so your local staging >> branch is tracking origin/master, rather than origin/staging. So *for >> you*, staging is the same branch as origin/master. And I'm trying to >> figure out how to diagnose this. >> >> For starters, can you look at the file .git/config (in your lilypond >> source top-level directory)? >> >> Here are my entries: >> >> [remote "origin"] >> url = carldsoren...@git.sv.gnu.org:/srv/git/lilypond.git >> fetch = +refs/heads/*:refs/remotes/origin/* > > I have > > [remote "origin"] > url = gnu:lilypond > fetch = +refs/heads/*:refs/remotes/origin/* > > gnu: is a shortcut defined elsewhere. > >> [branch "master"] >> remote = origin >> merge = master > > « > [branch "master"] > remote = origin > merge = refs/heads/master > rebase = true > » here.
Rebasing on master is not a good idea for the translation branch. It does not really matter if you don't actually check this branch out however or do work on it. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
