From: Frank <streamlake@tiscali.it>
To: git@vger.kernel.org
Subject: Cygwin: problem with renaming and case
Date: Fri, 21 Mar 2008 17:07:04 +0100 [thread overview]
Message-ID: <47E3DD28.4030302@tiscali.it> (raw)
Hi,
Don't know exactly if this is a bug or a feature or something in the
middle, but I have a lot of problems while changing just the casing of
file names and using git mv und cygwin. Here's a test case:
mkdir testrename
cd testrename
git init
echo "AAA" >aaa.txt
echo "BBB" >bbb.txt
git add aaa.txt
git add bbb.txt
git commit -m "First commit"
git checkout -b new_branch
git mv aaa.txt ccc.txt
git commit -a -m "Moved file"
echo "NEW AAA" >Aaa.txt
git add Aaa.txt
git commit -m "Added Aaa"
#aaa.txt exists in master, Aaa.txt in new_branch
git checkout master
Last command gives: "fatal: Untracked working tree file 'aaa.txt' would
be overwritten by merge".
I know I can use git checkout -f but the problem returns while others do
merging/pulling from my repo, etc.
Thanks,
Frank
next reply other threads:[~2008-03-21 16:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-21 16:07 Frank [this message]
2008-03-21 17:46 ` Cygwin: problem with renaming and case Linus Torvalds
2008-03-21 17:57 ` Avery Pennarun
2008-03-21 18:09 ` Linus Torvalds
2008-03-22 0:32 ` Junio C Hamano
2008-03-22 13:45 ` Steffen Prohaska
2008-03-21 18:57 ` Dmitry Potapov
2008-03-21 19:37 ` streamlake
2008-03-21 19:54 ` Brian Dessent
2008-03-22 19:58 ` Nagy Balázs
2008-03-22 20:18 ` Linus Torvalds
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=47E3DD28.4030302@tiscali.it \
--to=streamlake@tiscali.it \
--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