Git v1.8.4 has no idea how to diff Xcode .strings files. Here's how to fix that:
- Add the bit from
.gitconfigto your~/.gitconfig. - Add the bit from
.gitattributesto your project's.gitattributesfile. This should be at the root of your project, if one doesn't already exist. - You should now be able to use
git diffandgit add -pwith strings files.
The conversion seems to cause rendering issues for some non-Latin characters in iTerm2 v1.0.0.20140112 on Mac OS 10.9.2, but this doesn't affect the files themselves. If anyone knows how to fix this issue, please add a comment.
I met the same problem. I fixed it by changing the text encoding of Localizable.strings from
No explicit EncodingtoUTF-16, everything works fine now.