| Hey all,
I just ran into this in one of my projects and thought I would post the fix as I'm sure I'm not the only one to have run into this.
Git thinks that UTF-16 encoded text files are binary and won't automatically merge non-conflicting changes, which makes working on a D2W / localized project a real pain.
The fix is simple:
Create a .gitattributes file in the root of your project (probably right next to .gitignore - yes, alphabetically) with the following two lines:
[attr]utf16 diff merge -crlf *.strings utf16
Git will now automatically merge non-conflicting changes without any complaints!
You can also add those settings to your global git settings, but by putting it in the root of your project, anyone else that works on the project will immediately get the benefits too.
Hope this helps someone besides future me. I'm sure I'll be googling this issue again in 6 months.
(Hi future Dave! You are looking mighty handsome, I must say.)
Dave
—————————————————————————————
WebObjects - so easy that even Dave Avendasora can do it!™ ————————————————————————————— David Avendasora Senior Software Abuser Nekesto, Inc.
|