Add codekit-config.json to .gitattributes file.
Remove codekit-config.json from .gitignore file.
Stop git trying to merge ‘codekit-config.json’ files; and add some more handy (do not export on archive) settings to .gitattributes file.