On Jan 11, 2008, at 4:29 PM, Johannes Schindelin wrote:
Git should be able to detect this sort of conflict on a case- insensitivesystem.Do not blame git for the shortcomings of your setup!
Oh, I'm not surprised git doesn't handle this case, nor do I think git's required to. I merely think that, given the increasing relevance of OS X and the fact that it uses a case-insensitive system by default, this sort of problem is going to occur more and more frequently and it's quite a learning experience trying to fix it by hand. It would be very helpful if git could detect these problems itself.
However, as luck has it, I looked into this issue again, as somebodyraised it with msysgit (for obvious reasons; file systems on Windows are case challenged). If you are serious about this problem, I can give you tons of pointers how to go solve it. (Although I might be disconnectedthis weekend, because of the lack of competence of the IT department here.)
I think I've got a handle on it. I've already expunged the mis-cased file using git-rebase to remove the offending commit, now I just need to rewrite the second commit's message so it looks like the original commit (luckily I didn't do any work in the directory before I re- cased it). Thanks anyway.
-Kevin Ballard -- Kevin Ballard http://kevin.sb.org kevin@xxxxxx http://www.tildesoft.com
<<attachment: smime.p7s>>
