Kintsugi Versions Save

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

v0.5.4

1 year ago

What's Changed

kintsugi.gemspec: bump xcodeproj. by @barakwei in https://github.com/Lightricks/Kintsugi/pull/73
Kintsugi: bump to version 0.5.4. by @barakwei in https://github.com/Lightricks/Kintsugi/pull/74

New Contributors

@barakwei made their first contribution in https://github.com/Lightricks/Kintsugi/pull/73

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

v0.5.3

1 year ago

What's Changed

Kintsugi: Add release workflow. by @byohay in https://github.com/Lightricks/Kintsugi/pull/61
release.yml: Use latest rubygems version. by @byohay in https://github.com/Lightricks/Kintsugi/pull/62
release.yml: Add github release step. by @byohay in https://github.com/Lightricks/Kintsugi/pull/63
apply_change_to_project: Fix adding target product file multiple times. by @byohay in https://github.com/Lightricks/Kintsugi/pull/64
tests.yml: Use latest rubygems version. by @byohay in https://github.com/Lightricks/Kintsugi/pull/65
apply change: Fix adding component with non default simple attributes. by @byohay in https://github.com/Lightricks/Kintsugi/pull/67
apply_change_to_project: find existing refs if component changed to ref. by @ashdnazg in https://github.com/Lightricks/Kintsugi/pull/68
Kintsugi: Add integration tests. by @byohay in https://github.com/Lightricks/Kintsugi/pull/66
merge.rb: Refactor. by @byohay in https://github.com/Lightricks/Kintsugi/pull/69
Kintsugi: Raise to version 0.5.3. by @byohay in https://github.com/Lightricks/Kintsugi/pull/70
cli: add message after merge driver is successfully run. by @ashdnazg in https://github.com/Lightricks/Kintsugi/pull/71
release.yml: add github authentication. by @ashdnazg in https://github.com/Lightricks/Kintsugi/pull/72

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.5.2...v0.5.3

v0.5.2

1 year ago

What's Changed

v0.5.1 doesn't work well because it contains uncommited code. v0.5.2 fixes that.

v0.5.1

2 years ago

What's Changed

cli: fix incorrect git attributes file name. by @GalBerezansky in https://github.com/Lightricks/Kintsugi/pull/57

New Contributors

@GalBerezansky made their first contribution in https://github.com/Lightricks/Kintsugi/pull/57

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.5.0...v0.5.1

v0.5.0

2 years ago

What's Changed

spec_helper: Support "fit" focused tests. by @byohay in https://github.com/Lightricks/Kintsugi/pull/46
apply_change_to_project_spec: Raise if diff contains no changes. by @byohay in https://github.com/Lightricks/Kintsugi/pull/47
apply_change_to_project: Support SPM dependencies. by @byohay in https://github.com/Lightricks/Kintsugi/pull/50
kintsugi: Fix error codes on exceptions. by @byohay in https://github.com/Lightricks/Kintsugi/pull/51
apply_change_to_project: Raise on project reference without file. by @byohay in https://github.com/Lightricks/Kintsugi/pull/52
apply_change_to_project: Refactor simple value handling. by @byohay in https://github.com/Lightricks/Kintsugi/pull/48
xcodeproj_extensions: patch to_tree_hash to normalize build settings. by @ashdnazg in https://github.com/Lightricks/Kintsugi/pull/54
version: Cut version 0.5.0. by @byohay in https://github.com/Lightricks/Kintsugi/pull/55

New Contributors

@ashdnazg made their first contribution in https://github.com/Lightricks/Kintsugi/pull/54

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.4.3...v0.5.0

v0.4.3

2 years ago

What's Changed

kintsugi: Fix crash for project with spaces in name. by @byohay in https://github.com/Lightricks/Kintsugi/pull/42

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.4.2...v0.4.3

v0.4.2

2 years ago

What's Changed

uninstall-driver: Check if file exists before removing from attributes. by @byohay in https://github.com/Lightricks/Kintsugi/pull/35
kintsugi: Fix for project paths with spaces. by @byohay in https://github.com/Lightricks/Kintsugi/pull/38
cli: Align subcommands descriptions vertically. by @byohay in https://github.com/Lightricks/Kintsugi/pull/39

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.4.1...v0.4.2

v0.4.1

2 years ago

What's Changed

install-driver: Create attributes directory before appending line. by @byohay in https://github.com/Lightricks/Kintsugi/pull/34

v0.4.0

2 years ago

What's Changed

Add Xcake and Tuist as alternatives by @natanrolnik in https://github.com/Lightricks/Kintsugi/pull/15
Kintsugi: Support installing driver globally. by @byohay in https://github.com/Lightricks/Kintsugi/pull/29
kintsugi: Remove option parser from action arguments. by @byohay in https://github.com/Lightricks/Kintsugi/pull/30
kintsugi: Handle expected errors gracefully. by @byohay in https://github.com/Lightricks/Kintsugi/pull/31
cli: Fix expected number of arguments to uninstall-driver subcommand. by @byohay in https://github.com/Lightricks/Kintsugi/pull/33

New Contributors

@natanrolnik made their first contribution in https://github.com/Lightricks/Kintsugi/pull/15

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.3.1...v0.4.0

v0.3.1

2 years ago

What's Changed

apply_change_to_project: Add condition for treating removal as conflict. by @byohay in https://github.com/Lightricks/Kintsugi/pull/26
kintsugi: Relax required versions for Xcodeproj dependency. by @byohay in https://github.com/Lightricks/Kintsugi/pull/28

Full Changelog: https://github.com/Lightricks/Kintsugi/compare/v0.3.0...v0.3.1