This release includes the following improvements:

Remove duplicates from the list of references: Xcode sometimes includes duplicate entries in the list of file references. The new version of the script will find and remove these duplicated entries.

Throws error when Xcode project file still has conflicts: In previous versions, the script marked the merge as successful even if there were still conflicts within the project. This has been fixed, and the script will now throw an error if there are any remaining conflicts.

Automatically resolve conflicts in the following areas:

• PBXBuildFile section
• PBXFileReference section
• PBXGroup section
• PBXSourcesBuildPhase section

Handling these sections cover the most common file operations that cause a conflict:

• Adding, deleting, moving renaming files and groups