Comments on Me with Authentic Battle Damage Blog: Xcode Project Files And Git

@Steve, I am going to try those! Thanks!

2011-09-01T17:08:32.067-07:00

@Steve, I am going to try those! Thanks!

I've also been in project file merge hell, esp...

2011-09-01T16:50:18.982-07:00

I've also been in project file merge hell, especially with a large team. A few things I've done to try and avoid the pain:

- put all build settings in xcconfig files, not in the project file
- put all resources in a bundle, so the project file just has a single reference to the bundle and you can rearrange all you want within it
- use feature toggles instead of feature branches, so the project file doesn't get a change to diverge

Great post. I would agree, this is one of the wors...

2011-09-01T06:22:01.010-07:00

Great post. I would agree, this is one of the worst pain points, not only when working with someone else, but when working with multiple branches on your own and merging between them! I look forward to your next post on this subject!