git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Cygwin error?

From
NKnadim khemir <nadim@khemir.net>
Date
Nov 19, 2008, 17:57 UTC
Message-ID
<200811191857.30793.nadim@khemir.net>
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.
Next: Andreas Ericsson
Message 1 of 2 in “Cygwin error?”
  1. nadim khemirNov 19, 2008
  2. Andreas EricssonNov 20, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.