script for merging XCode project files in git