Kintsugi Versions Save

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

v0.7.5

2 months ago

What's Changed

kintsugi.gemspec: bump xcodeproj by @alexandre-pod in https://github.com/Lightricks/Kintsugi/pull/116
Kintsugi: cut version 0.7.5. by @barakwei in https://github.com/Lightricks/Kintsugi/pull/117

New Contributors

@alexandre-pod made their first contribution in https://github.com/Lightricks/Kintsugi/pull/116

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.7.4...v0.7.5

v0.7.4

4 months ago

What's Changed

CI: test on multiple ruby versions. by @barakwei in https://github.com/Lightricks/Kintsugi/pull/113
xcodeproj_extensions: fix wrong serialization with swift package target. by @barakwei in https://github.com/Lightricks/Kintsugi/pull/112
Release: use head ruby version. by @barakwei in https://github.com/Lightricks/Kintsugi/pull/114
Kintsugi: cut version 0.7.4. by @barakwei in https://github.com/Lightricks/Kintsugi/pull/115

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.7.3...v0.7.4

v0.7.3

7 months ago

What's Changed

kintsugi.gemspec: bump xcodeproj for Xcode 15 by @banjun in https://github.com/Lightricks/Kintsugi/pull/109
Kintsugi: Cut version 0.7.3. by @byohay in https://github.com/Lightricks/Kintsugi/pull/110

New Contributors

@banjun made their first contribution in https://github.com/Lightricks/Kintsugi/pull/109

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.7.2...v0.7.3

v0.7.2

9 months ago

What's Changed

apply_change_to_project: Fix adding file to target with existing name. by @byohay in https://github.com/Lightricks/Kintsugi/pull/105
xcodeproj_extensions: Fix crash in PBXTargetDependency. by @byohay in https://github.com/Lightricks/Kintsugi/pull/107
version: Set to 0.7.2. by @byohay in https://github.com/Lightricks/Kintsugi/pull/108

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.7.1...v0.7.2

v0.7.1

1 year ago

What's Changed

kintsugi: Fix passing options from install-driver to driver. by @byohay in https://github.com/Lightricks/Kintsugi/pull/100
cli: expose all merge settings flags to driver. by @ashdnazg in https://github.com/Lightricks/Kintsugi/pull/102
Kintsugi: Cut version 0.7.1. by @byohay in https://github.com/Lightricks/Kintsugi/pull/101

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.7.0...v0.7.1

v0.7.0

1 year ago

What's Changed

tests.yml: Update ruby version. by @byohay in https://github.com/Lightricks/Kintsugi/pull/97
apply_change_to_project: Resolve some merge errors interactively. by @byohay in https://github.com/Lightricks/Kintsugi/pull/96
Kintsugi: Cut version 0.7.0. by @byohay in https://github.com/Lightricks/Kintsugi/pull/98

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.6.3...v0.7.0

v0.6.3

1 year ago

What's Changed

apply_change_to_project: Fix adding file or group to non existent group. by @byohay in https://github.com/Lightricks/Kintsugi/pull/93
version.rb: Cut version 0.6.3. by @byohay in https://github.com/Lightricks/Kintsugi/pull/94

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.6.2...v0.6.3

v0.6.2

1 year ago

What's Changed

Kintsugi: Fix crash when a build file without file reference exists. by @byohay in https://github.com/Lightricks/Kintsugi/pull/90
apply_change_to_project: fix group moves. by @ashdnazg in https://github.com/Lightricks/Kintsugi/pull/88
version.rb: Cut version 0.6.2. by @byohay in https://github.com/Lightricks/Kintsugi/pull/91

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.6.1...v0.6.2

v0.6.1

1 year ago

What's Changed

apply_change_to_project: Ignore when diff is nil or without root object. by @byohay in https://github.com/Lightricks/Kintsugi/pull/86
version.rb: Raise to 0.6.1. by @byohay in https://github.com/Lightricks/Kintsugi/pull/87

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.6.0...v0.6.1

v0.6.0

1 year ago

Kintsugi now ignores duplicates of the same files, groups and build settings. If you want to preserve the previous behavior, use --allow-duplicates.

What's Changed

Support merging conflicts with moved files. by @ashdnazg in https://github.com/Lightricks/Kintsugi/pull/78
Kintsugi: Avoid adding duplicates if settings don't allow. by @byohay in https://github.com/Lightricks/Kintsugi/pull/76
kintsugi_apply_change_to_project_spec: cleanup unnecessary saves. by @ashdnazg in https://github.com/Lightricks/Kintsugi/pull/79
apply_change_to_project: Identify child reference proxy by remote ref. by @byohay in https://github.com/Lightricks/Kintsugi/pull/80
apply_change_to_project: Fix ignoring removal of non existent group. by @byohay in https://github.com/Lightricks/Kintsugi/pull/81
apply_change_to_project: Handle remove configuration list change. by @byohay in https://github.com/Lightricks/Kintsugi/pull/82
Kintsugi: Treat files as identical by a subset of their attributes. by @byohay in https://github.com/Lightricks/Kintsugi/pull/83
version.rb: Raise to 0.6.0. by @byohay in https://github.com/Lightricks/Kintsugi/pull/84

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.5.4...v0.6.0