From: Avery Pennarun Date: Fri, 21 Mar 2008 17:57:42 GMT Subject: Re: Cygwin: problem with renaming and case Message-ID: <32541b130803211057h22310557ne605e39e6b894e11@mail.gmail.com> In-Reply-To: On Fri, Mar 21, 2008 at 1:46 PM, Linus Torvalds wrote: > Now, you're tracking "Aaa.txt" in the branch you're leaving, and git knows > that, but git also knows that the branch you're leaving is *not* tracking > "aaa.txt", so obviously the copy of "aaa.txt" that the filesystem reports > is not saved anywhere, and git says "I refuse to overwrite it, because > that would destroy your untracked content". I don't know if this helps, but if git would delete the files it's planning to forget before checking the existence of files it's planning to create, case sensitivity problems like these would automatically disappear and you wouldn't have to worry about case (and accent, and and...) folding by hand. Unfortunately, that would mean git is changing things around before it can safely make a decision about whether that's a good idea. That said, it would be possible to put things back, since it knows the files it deleted are stored safely in the original branch anyway. Have fun, Avery