2007/9/21, Johannes Schindelin <[EMAIL PROTECTED]>: > Hi, Hi Johannes,
> This means that you have local changes. Try "git status" and/or "git > diff" to find out which changes those are. The point is: I do not have local changes: I haven't been working on the code nor modifying anything... maybe this error message is more self explanatory: %%% Auto-merging VERSION CONFLICT (content): Merge conflict in VERSION Automatic merge failed; fix conflicts and then commit the result %%% ...and the git-diff goes: %%% diff --cc VERSION index aa9f7e7,7242416..0000000 --- a/VERSION +++ b/VERSION @@@ -1,6 -1,6 +1,11 @@@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=11 ++<<<<<<< HEAD/VERSION +PATCH_LEVEL=33 +MY_PATCH_LEVEL= ++======= + PATCH_LEVEL=32 + MY_PATCH_LEVEL=rz1 ++>>>>>>> 1982a5513e92f4f01605e9dbfdbb997f314b1cac/VERSION %%% I can't understand what's wrong this different versions thing. Every other branch gives me the message "already up to date". Can you enlighten me? Thanks, Valentin _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
