Lightricks/Kintsugi
A tool to automatically resolve Git conflicts that occur in Xcode project files
RubyMIT
Issues
- 1
undefined method `configuration_list' for #<Xcodeproj::Project::Object::PBXNativeTarget:0x0000000134c74c98> (NoMethodError)
#118 opened by sme-shyl001 - 4
undefined method `configuration_list'
#111 opened by codyrotwein - 2
Better message for manual intervention
#103 opened by igorkulman - 1
- 3
- 2
- 2
- 0
Better support for real conflicts
#5 opened by byohay - 2
- 2
`apply_change_to_project': undefined method `[]' for nil:NilClass (NoMethodError)
#85 opened by chrispyballer - 1
- 0
Support for ignoring duplicates
#6 opened by byohay - 2
kintsugi asking me to resolve conflict manually
#77 opened by Ochornma - 3
Avoid duplicate references in same Xcode "Group" following conflict resolution
#75 opened by pryder-fleetaero - 2
Cannot merge conflicts anymore
#59 opened by igorkulman - 2
Command not found
#56 opened by abdlkdrisiktan - 4
SPM changes
#49 opened by pryder-fleetaero - 2
Error: `apply_removal_to_simple_attribute': undefined method `-' for "":String (NoMethodError)
#44 opened by dtamiazzo - 5
- 2
Project files with spaces not supported
#37 opened by futuretap - 2
Installing merge driver fails
#32 opened by igorkulman - 3
- 2
- 2
Error when using `--changes-output-path`
#20 opened by oskargargas - 4
Add support (and/or instructions) on how to use this tool as a custom merge driver
#13 opened by rogerluan - 4
Runtime error
#14 opened by gigisommo