2009/8/10 Johannes Sixt <j.sixt@xxxxxxxxxxxxx>:
> Rostislav Svoboda schrieb:
>> 2009/8/10 Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>:
>>> Hello,
>>>
>>>> $ git checkout master
>>>> error: Untracked working tree file 'Project/bin/path/file.jjt' would
>>>> be overwritten by merge.
>>> What is the output of
>>>
>>> $ git ls-files master bin/
>>
>> Nothing:
>
> It should have been
>
> $ git ls-tree master bin
Merde!
$ git ls-tree master Project/bin/path/file.jjt
100644 blob 8d5e24f12c37fd1a435de2d4402591f5b0c2a3cc
Project/bin/path/file.jjt
There's a file.jjt in the repo already! But guys! I bet I'm not the
first one having this problem. Do you think it would be wise to have a
kind of a check returning
'The file '...' ignored in the branch X is not ignored in the
branch Y (or something)'
instead of responding questions like mine over and over again?
Bost
PS: ... and yea, thx a lot!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html