Kintsugi: Automatically resolve Xcode Git conflictsgithub.com/Lightricks5 pointsstatusreport5 years ago