What is this?
One of the frustrations of working with Xcode together with Git is resolving conflicts in Xcode project files, i.e. the
Kintsugi sets out to solve this exact problem: Automatically resolving Git merge conflicts occurring in
The end goal is for the tool to succeed 99.9% of the time, and let you resolve the real conflicts in a convenient way the rest of the time.
Kintsugi (金継ぎ) is the art of repairing broken pottery by mending it with gold. Wikipedia
Kintsugi understands the changes you've made to the
.pbxproj file, so it simply resets the conflicts and re-applies those changes to it.
From a technical perspective, Kintsugi heavily relies on Xcodeproj. It uses its diff capability to extract the changes, and uses its project files editing capabilities to apply the changes.
$ gem install kintsugi
If you prefer to use bundler, add the following line to your Gemfile:
gem 'kintsugi', require: false
When there's a
.pbxproj file with Git conflicts, and a 3-way merge is possible, run
And see the magic happen! ✨
Git merge driver
To use Kintsugi as a Git merge driver, follow these steps:
- Add it as driver to Git config file by running the following:
git config merge.kintsugi.name "Kintsugi driver" # Or any other name you prefer git config merge.kintsugi.driver "kintsugi driver %O %A %B %P"
kintsugi should be in your
git config with
--global to add this to the global config file.
- Add the following line to the
.gitattributesfile at the root of the repository:
This will instruct Git to use Kintsugi as a merge driver for
See the official docs if you want to set this globally.
See our Contribution guidelines.
XcodeGen: You can commit this JSON file into Git instead of the
.pbxprojfile. Then resolving conflicts is much easier.
Copyright (c) 2021 Lightricks. See LICENSE for details.