Hi, Given: $ git pull remote: Counting objects: 46, done. ... Updating b80286d..a543dae error: Untracked working tree file 'xxx.txt' would be overwritten by merge. This is due to a rename of xxx.txt to Xxx.txt. I understand that this is due to files being just case preserving on Cycwin/Win32. The only I found was to remove the xxx.txt localy and do a pull. The interresting thing is that Xxx.txt is no present in my file system. I can check it out from HEAD though. What did I missunderstood and do wrong? Cheers, Nadim. -- 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