From: nadim khemir <nadim@khemir.net>
To: git@vger.kernel.org
Subject: Cygwin error?
Date: Wed, 19 Nov 2008 18:57:30 +0100 [thread overview]
Message-ID: <200811191857.30793.nadim@khemir.net> (raw)
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 reply other threads:[~2008-11-19 18:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-19 17:57 nadim khemir [this message]
2008-11-20 8:57 ` Cygwin error? Andreas Ericsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200811191857.30793.nadim@khemir.net \
--to=nadim@khemir.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox