{"thread":{"id":"16397","subject":"Cygwin error?","startedAt":"2008-11-19T17:57:30Z","lastAt":"2008-11-20T08:57:13Z","messageCount":2,"participants":["nadim khemir","Andreas Ericsson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"96177","messageId":"200811191857.30793.nadim@khemir.net","threadId":"16397","inReplyTo":null,"subject":"Cygwin error?","fromName":"nadim khemir","fromEmail":"nadim@khemir.net","sentAt":"2008-11-19T17:57:30Z","receivedAt":"2008-11-19T17:57:30Z","isPatch":false,"sender":{"key":"nadim@khemir.net","avatar":null},"body":"Hi, Given:\n\n$ git pull\nremote: Counting objects: 46, done.\n...\nUpdating b80286d..a543dae\nerror: Untracked working tree file 'xxx.txt' would be overwritten by merge.\n\n\nThis is due to a rename of xxx.txt to Xxx.txt. I  understand that this is due \nto files being just case preserving on Cycwin/Win32.\n\nThe only I found was to remove the xxx.txt localy and do a pull. The \ninterresting thing is that Xxx.txt is no present in my file system. I can \ncheck it out from HEAD though.\n\nWhat did I missunderstood and do wrong?\n\nCheers, Nadim.\n"},{"id":"96207","messageId":"49252669.7060304@op5.se","threadId":"16397","inReplyTo":"200811191857.30793.nadim@khemir.net","subject":"Re: Cygwin error?","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2008-11-20T08:57:13Z","receivedAt":"2008-11-20T08:57:13Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"nadim khemir wrote:\n> Hi, Given:\n> \n> $ git pull\n> remote: Counting objects: 46, done.\n> ...\n> Updating b80286d..a543dae\n> error: Untracked working tree file 'xxx.txt' would be overwritten by merge.\n> \n> \n> This is due to a rename of xxx.txt to Xxx.txt. I  understand that this is due \n> to files being just case preserving on Cycwin/Win32.\n> \n> The only I found was to remove the xxx.txt localy and do a pull. The \n> interresting thing is that Xxx.txt is no present in my file system. I can \n> check it out from HEAD though.\n> \n> What did I missunderstood and do wrong?\n> \n\nYou ran into a corner-case. Git expects the \"Xxx.txt\" and \"xxx.txt\" to be\ndifferent. Cross-OS projects should never, ever rename files so that they\nend up with case ambiguity. Since they did, the only thing you can really\ndo is this:\n\ngit fetch\nrm xxx.txt\ngit reset --hard origin/master; # or whatever branch you're interested in\n\nI'm afraid you'll have problems with this until all the branches you're\ninterested in have this change.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"}]}