Hi, On Fri, 21 Sep 2007, Valentin Villenave wrote:
> 2007/9/21, Rune Zedeler <[EMAIL PROTECTED]>: > > > Sorry for the noise. > > I get this error message when I try to get your branch: > > %%% > Trying really trivial in-index merge... > VERSION: needs merge > fatal: you need to resolve your current index first This means that you have local changes. Try "git status" and/or "git diff" to find out which changes those are. As a rule of thumb, you should not pull if you have uncommitted changes. Ciao, Dscho _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
