In my git (Xcode) project, I committed a filename with improper case. Now I went to try to rename it, but when I commit, I get: fatal: Will not add file alias 'MyProject/MyFile.h' ...
I sometimes have to make git merges on the console. Up until now, for resolving conflicts, I was using Xcode 3's FileMerge (you can open it on the console using the 'opendiff' command). If conflicts ...