Kintsugi resolves your .pbxproj merge conflicts
This tool aims to make that exact problem a little easier. It uses diff capability to extract changes, and your project file editing capability to re-apply the changes.
What we like
- It resets your conflicts and re-applies your changes
- Automatic resolver when conflicts occur
- One clear goal: do one thing well, and work 99.9% of the time