A Better Way to Automatically Merge Changes in Your XCode Project Files | Hacker News Reader