Re: Git help

[Valentin Villenave]

2007/9/21, Rune Zedeler <address@hidden>:

> 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
Nope.
Merging HEAD with 1982a5513e92f4f01605e9dbfdbb997f314b1cac
Merging:
239a9680db866039cbab17c10f99a6c13339dc12 fr changing default
1982a5513e92f4f01605e9dbfdbb997f314b1cac removed debug-output
(whoops), changed version to rz1
found 1 common ancestor(s):
2ae5726ea4fcbcd40e42678db32d7da3227ef44a Translation of setup.itely to German
git-read-tree: fatal: you need to resolve your current index first

No merge strategy handled the merge.
%%%%

I don't know how to solve it. I do have merge, rcs and everything
installed though (besides, when I try with, for instance, Joe's
branch, everything goes fine :(
What the hell am I doing wrong?
Thanks
Valentin