merge-conflicts
Incremental merge for git
AI-powered git merge conflict resolver — fix conflicts in seconds, not minutes
merge Xcode project file is so easy
