[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git help
From: |
Valentin Villenave |
Subject: |
Re: Git help |
Date: |
Fri, 21 Sep 2007 21:29:40 +0800 |
2007/9/21, Johannes Schindelin <address@hidden>:
> 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
- Git help, Rune Zedeler, 2007/09/21
- Re: Git help, Rune Zedeler, 2007/09/21
- Re: Git help, Valentin Villenave, 2007/09/21
- Re: Git help, Johannes Schindelin, 2007/09/21
- Re: Git help,
Valentin Villenave <=
- Re: Git help, Johannes Schindelin, 2007/09/21
- Re: Git help, Rune Zedeler, 2007/09/21
- Re: Git help, Johannes Schindelin, 2007/09/21
- Re: Git help, Valentin Villenave, 2007/09/21
- Re: Git help, Johannes Schindelin, 2007/09/21