Lightricks / Kintsugi

A tool to automatically resolve Git conflicts that occur in Xcode project files

Lightricks/Kintsugi Issues

undefined method `configuration_list' for #<Xcodeproj::Project::Object::PBXNativeTarget:0x0000000134c74c98> (NoMethodError)
Closed 2 months ago1
undefined method `configuration_list'
Closed 8 months ago4
Better message for manual intervention
Closed 3 months ago2
undefined method `to_tree_hash' for nil:NilClass (NoMethodError)
Closed a year ago1
Bad handling of files with the same name in different targets
Closed a year ago3
undefined method `to_tree_hash' for nil:NilClass (NoMethodError)
Closed 2 years ago2
Invalid option error in install-driver when using driver-options
Closed a year ago2
Better support for real conflicts
Closed a year ago
undefined method `children' for nil:NilClass (NoMethodError)
Closed 2 years ago2
`apply_change_to_project': undefined method `[]' for nil:NilClass (NoMethodError)
Closed 2 years ago2
undefined method `path' for nil:NilClass (NoMethodError)
Closed 2 years ago1
Support for ignoring duplicates
Closed 2 years ago
kintsugi asking me to resolve conflict manually
Closed 2 years ago2
Avoid duplicate references in same Xcode "Group" following conflict resolution
Closed 2 years ago3
Cannot merge conflicts anymore
Closed 2 years ago2
Command not found
Closed 2 years ago2
SPM changes
Closed 2 years ago4
Error: `apply_removal_to_simple_attribute': undefined method `-' for "":String (NoMethodError)
Closed 2 years ago2
Fails when ????.xcodeproj has space in name
Closed 2 years ago5
Project files with spaces not supported
Closed 3 years ago2
Installing merge driver fails
Closed 3 years ago2
Bundler could not find compatible versions for gem "xcodeproj"
Closed 3 years ago3
Trying to add unsupported component type PBXAggregateTarget
Closed 3 years ago2
Error when using `--changes-output-path`
Closed 3 years ago2
Add support (and/or instructions) on how to use this tool as a custom merge driver
Closed 3 years ago4
Runtime error
Closed 3 years ago4