git merge Localizable.strings file?

Question

I'm trying to configure git to work with merging Localizable.strings files on an iOS project. somehow, i noticed that xCode can open the files properly, but git doesn't know how. git treats all .strings files as binary files.

i tried to follow the directions here:

http://blog.xk72.com/post/31456986659/diff-strings-files-in-git

but it's not working for me -> when i do a git merge, git still doesn't show me the conflicts with <<<<< ===== and >>>> in the files. specifically, i get this output:

fatal: bad config file line 41 in .git/config

where my config file on line 41 looks like:

 41 [diff “localizablestrings”]
 42     textconv = “iconv -f utf-16 -t utf-8”

how do i configure git to recognize and properly merge *.strings files?

i also checkedout some of the tools, such as: http://www.loc-suite.org/ but it has 0 documentation.

===================== UPDATE:

okay, so it turns out the double quotes i copy and pasted from html is bad. * facepalm *.

but now even when i merge, i still don't see the git merge conflict markers (>>>>> and <<<<<). is git still not merging these files as text files?

did you add *.strings diff=localizablestrings to your .gitattributes like that article describes? — Justin Howard
– Justin Howard, Commented Nov 13, 2014 at 22:21

David T. · Accepted Answer · 2014-11-17 19:57:39Z

4

The best way to do this is to use xCode's merge feature.

answered Nov 17, 2014 at 19:57

David T.

23.7k24 gold badges75 silver badges125 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

git merge Localizable.strings file?

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related