# Lightricks/Kintsugi

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

Repository: https://github.com/Lightricks/Kintsugi
Canonical: https://ross.abutalabs.com/products/kintsugi
Language: Ruby
License: MIT
License Family: permissive
Last push: 2026-07-27T07:33:16+00:00

## Health v2 (maintenance only)
Score: 72/100 (v2, computed 2026-09-03T02:20:16.233290+00:00)
- activity 94, release rhythm 28, longevity 100
- inputs: {"age_days": 1962, "days_push": 37, "days_rel": 644, "gap_med": 36.0, "n_releases_24m": 3}
- flags: none
- formula: round(0.45*activity + 0.35*rhythm + 0.20*longevity); archived -> min(score, 10)

## Adoption (not part of the score)
Stars 1073, forks 27 (observed 2026-08-28T04:03:28.761660+00:00)

## What it is
Kintsugi is a Ruby CLI tool that automatically resolves Git merge conflicts in Xcode project (.pbxproj) files. It works as a standalone command or as a custom Git merge driver, using Xcodeproj to re-apply changes instead of manual conflict resolution.

## Use cases
- automatically resolve git merge conflicts in xcode project files
- install a git merge driver for pbxproj files
- fix project.pbxproj conflicts after merging branches
- avoid manually merging xcode project files
- interactive resolution of unresolvable pbxproj conflicts

## When to choose
- your team uses Xcode and frequently hits merge conflicts in .pbxproj files
- you want a gitattributes-configured merge driver that resolves pbxproj conflicts automatically
- you want an interactive fallback when automatic resolution fails

## When to avoid
- your project does not use Xcode or .pbxproj files
- you need conflict resolution for general source code files rather than Xcode project files

## Facets
- artifact type: cli-tool
- maturity: active
- function: developer-tools, version-control, parser
- domain: developer-tools, version-control, mobile-development
- platform: cli, cross-platform
- tags: xcode, pbxproj, git-merge-driver, conflict-resolution, ruby-gem, ios-development, macos

## Member repositories
- Lightricks/Kintsugi (main) score 72

## Provenance
- Observed fields: from GitHub, fetched 2026-08-28T04:03:28.761660+00:00.
- Health v2: computed from the inputs above; adoption is never an input.
- Inferred fields (summary, facets, guidance): AI-extracted, prompt v1, taxonomy v1, on 2026-08-30T06:53:35.094376+00:00, confidence not recorded.
  - readme: https://github.com/Lightricks/Kintsugi (fetched 2026-08-28T04:03:28.761660+00:00, sha 5663c8528ed4)
- Data as of 2026-08-30T08:39:29.467469+00:00.