RubyGems - kintsugi - Versions diffs - 0.6.2 → 0.7.0 - Mend

kintsugi 0.6.2 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

checksums.yaml +4 -4
data/.github/workflows/release.yml +1 -1
data/.github/workflows/tests.yml +1 -1
data/README.md +10 -0
data/assets/interactive-conflict-resolution.png +0 -0
data/kintsugi.gemspec +1 -0
data/lib/kintsugi/apply_change_to_project.rb +210 -116
data/lib/kintsugi/cli.rb +25 -8
data/lib/kintsugi/conflict_resolver.rb +130 -0
data/lib/kintsugi/merge.rb +7 -4
data/lib/kintsugi/settings.rb +8 -0
data/lib/kintsugi/version.rb +1 -1
data/lib/kintsugi/xcodeproj_extensions.rb +49 -1
data/spec/kintsugi_apply_change_to_project_spec.rb +686 -108
data/spec/kintsugi_integration_spec.rb +2 -1
metadata +19 -3

data/spec/kintsugi_apply_change_to_project_spec.rb CHANGED Viewed

@@ -6,9 +6,11 @@ require "json"
 require "rspec"
 require "tempfile"
 require "tmpdir"
+require "tty-prompt"
 require "kintsugi/apply_change_to_project"
 require "kintsugi/error"
+require "tty/prompt/test"
 require_relative "be_equivalent_to_project"
@@ -18,6 +20,7 @@ describe Kintsugi, :apply_change_to_project do
   let(:base_project) { Xcodeproj::Project.new(base_project_path) }
   before do
+    Kintsugi::Settings.interactive_resolution = false
     base_project.save
   end
@@ -29,8 +32,9 @@ describe Kintsugi, :apply_change_to_project do
   it "not raises when change is nil or doesn't have root object" do
     expect {
-      described_class.apply_change_to_project(base_project, nil)
-      described_class.apply_change_to_project(base_project, {})
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      described_class.apply_change_to_project(base_project, nil, theirs_project)
+      described_class.apply_change_to_project(base_project, {}, theirs_project)
     }.not_to raise_error
   end
@@ -40,7 +44,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -51,7 +55,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -64,7 +68,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -75,7 +79,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
   end
@@ -96,7 +100,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -113,7 +117,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
   end
@@ -131,10 +135,27 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
     expect {
-      described_class.apply_change_to_project(ours_project, changes_to_apply)
+      described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
     }.to raise_error(Kintsugi::MergeError)
   end
+  it "ignores removal of a product reference that was already removed" do
+    base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+    base_project.save
+    ours_project = create_copy_of_project(base_project.path, "ours")
+    ours_project.targets[0].product_reference.remove_from_project
+    theirs_project = create_copy_of_project(base_project.path, "theirs")
+    theirs_project.targets[0].product_reference.remove_from_project
+    changes_to_apply = get_diff(theirs_project, base_project)
+    described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+    expect(ours_project).to be_equivalent_to_project(theirs_project)
+  end
   describe "file related changes" do
     let(:filepath) { "foo" }
@@ -154,11 +175,64 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
+    it "raises if trying to move file to another group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.save
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      new_group = theirs_project.main_group.find_subpath("new_group")
+      file_reference = theirs_project.main_group.find_file_by_path(filepath)
+      file_reference.move(new_group)
+      changes_to_apply = get_diff(theirs_project, base_project)
+      base_project.main_group.find_subpath("new_group").remove_from_project
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
+      }.to raise_error(Kintsugi::MergeError)
+    end
+    it "raises if trying to add file to a group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.save
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.main_group.find_subpath("new_group").new_reference("foo")
+      changes_to_apply = get_diff(theirs_project, base_project)
+      base_project.main_group.find_subpath("new_group").remove_from_project
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
+      }.to raise_error(Kintsugi::MergeError)
+    end
+    it "does nothing if trying to remove a file from a group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true).new_reference("foo")
+      base_project.save
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project.main_group.find_subpath("new_group/foo").remove_from_project
+      changes_to_apply = get_diff(theirs_project, base_project)
+      base_project.main_group.find_subpath("new_group").remove_from_project
+      base_project.save
+      expected_project = create_copy_of_project(base_project.path, "expected")
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
+      expect(base_project).to be_equivalent_to_project(expected_project)
+    end
     it "raises when a file is split into two" do
       base_project.main_group.find_subpath("new_group", true)
       base_project.main_group.find_subpath("new_group2", true)
@@ -173,7 +247,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
       expect {
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       }.to raise_error(Kintsugi::MergeError)
     end
@@ -184,7 +258,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -198,7 +272,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -214,11 +288,44 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
+    it "raises when trying to add a group to a group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.save
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project["new_group"].find_subpath("sub_group", true)
+      changes_to_apply = get_diff(theirs_project, base_project)
+      base_project.main_group.find_subpath("new_group").remove_from_project
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
+      }.to raise_error(Kintsugi::MergeError)
+    end
+    it "raises when trying to move a group to a group that no longer exists" do
+      base_project.main_group.find_subpath("new_group", true)
+      base_project.main_group.find_subpath("other_group", true)
+      base_project.save
+      theirs_project = create_copy_of_project(base_project.path, "theirs")
+      theirs_project["other_group"].move(theirs_project["new_group"])
+      changes_to_apply = get_diff(theirs_project, base_project)
+      base_project.main_group.find_subpath("new_group").remove_from_project
+      expect {
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
+      }.to raise_error(Kintsugi::MergeError)
+    end
     it "moves a group with a group in it" do
       new_group = base_project.main_group.find_subpath("new_group", true)
       new_group.find_subpath("sub_group", true)
@@ -230,7 +337,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -247,7 +354,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -260,7 +367,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -272,7 +379,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -283,7 +390,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -300,7 +407,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -316,7 +423,7 @@ describe Kintsugi, :apply_change_to_project do
       base_project.main_group.children.delete_at(-1)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -339,7 +446,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -354,7 +461,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -368,7 +475,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -383,30 +490,31 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
     describe "dealing with unexpected change" do
-      it "ignores change to a file whose containing group doesn't exist" do
+      it "raises if applying change to a file whose containing group doesn't exist" do
         ours_project = create_copy_of_project(base_project.path, "ours")
-        ours_project.main_group.remove_from_project
+        new_group = ours_project.main_group.find_subpath("new_group", true)
+        ours_project.main_group.find_file_by_path(filepath).move(new_group)
         ours_project.save
         theirs_project = create_copy_of_project(base_project.path, "theirs")
         theirs_project.main_group.find_file_by_path(filepath).explicit_file_type = "bar"
-        changes_to_apply = get_diff(theirs_project, base_project)
+        ours_project.main_group.find_subpath("new_group").remove_from_project
-        ours_project_before_applying_changes = create_copy_of_project(ours_project.path, "ours")
-        described_class.apply_change_to_project(ours_project, changes_to_apply)
+        changes_to_apply = get_diff(theirs_project, base_project)
-        expect(ours_project).to be_equivalent_to_project(ours_project_before_applying_changes)
+        expect {
+          described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        }.to raise_error(Kintsugi::MergeError)
       end
-      it "ignores change to a file that doesn't exist" do
+      it "raises if applying change to a file that doesn't exist" do
         ours_project = create_copy_of_project(base_project.path, "ours")
         ours_project.main_group.find_file_by_path(filepath).remove_from_project
         ours_project.save
@@ -416,11 +524,9 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        ours_project_before_applying_changes = create_copy_of_project(ours_project.path, "ours")
-        described_class.apply_change_to_project(ours_project, changes_to_apply)
-        expect(ours_project).to be_equivalent_to_project(ours_project_before_applying_changes)
+        expect {
+          described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        }.to raise_error(Kintsugi::MergeError)
       end
       it "ignores removal of a file whose group doesn't exist" do
@@ -435,7 +541,7 @@ describe Kintsugi, :apply_change_to_project do
         ours_project_before_applying_changes = create_copy_of_project(ours_project.path, "ours")
-        described_class.apply_change_to_project(ours_project, changes_to_apply)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
         expect(ours_project).to be_equivalent_to_project(ours_project_before_applying_changes)
       end
@@ -449,7 +555,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(ours_project, changes_to_apply)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
         expect(ours_project).to be_equivalent_to_project(theirs_project)
       end
@@ -474,7 +580,7 @@ describe Kintsugi, :apply_change_to_project do
       file_reference.move(new_group)
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -489,7 +595,7 @@ describe Kintsugi, :apply_change_to_project do
       file_reference.move(theirs_project.main_group)
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -506,7 +612,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -518,6 +624,10 @@ describe Kintsugi, :apply_change_to_project do
       base_project.targets[0].frameworks_build_phase.add_file_reference(file_reference)
       add_new_subproject_to_project(base_project, "subproj", framework_filename)
+      # Removes the container item proxy to make sure the display name of the reference proxy is the
+      # same as the file reference.
+      base_project.root_object.project_references[-1][:product_group].children[0].remote_ref.remove_from_project
       base_project.save
       theirs_project = create_copy_of_project(base_project.path, "theirs")
@@ -530,7 +640,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -542,7 +652,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -551,9 +661,12 @@ describe Kintsugi, :apply_change_to_project do
       framework_filename = "baz"
       add_new_subproject_to_project(base_project, "subproj", framework_filename)
-      base_project.targets[0].frameworks_build_phase.add_file_reference(
+      subproject_reference_proxy =
         base_project.root_object.project_references[0][:product_group].children[0]
-      )
+      # Removes the container item proxy to make sure the display name of the reference proxy is the
+      # same as the file reference.
+      subproject_reference_proxy.remote_ref.remove_from_project
+      base_project.targets[0].frameworks_build_phase.add_file_reference(subproject_reference_proxy)
       base_project.save
@@ -567,7 +680,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       # This verifies we haven't created a new file reference instead of reusing the one in the
       # hierarchy.
       base_project.files[-1].name = "foo"
@@ -595,9 +708,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      changes_to_apply["rootObject"].delete("projectReferences")
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -623,7 +734,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -639,7 +750,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
@@ -655,7 +766,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
       other_project = create_copy_of_project(base_project.path, "theirs")
-      described_class.apply_change_to_project(other_project, changes_to_apply)
+      described_class.apply_change_to_project(other_project, changes_to_apply, theirs_project)
       expect(other_project).to be_equivalent_to_project(theirs_project)
     end
@@ -674,7 +785,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
@@ -694,7 +805,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -712,7 +823,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
@@ -730,7 +841,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
       other_project = create_copy_of_project(base_project.path, "other")
-      described_class.apply_change_to_project(other_project, changes_to_apply)
+      described_class.apply_change_to_project(other_project, changes_to_apply, theirs_project)
       expect(other_project).to be_equivalent_to_project(base_project)
     end
@@ -755,7 +866,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project, ignore_keys: ["containerPortal"])
     end
@@ -770,7 +881,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -790,7 +901,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -807,7 +918,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -830,7 +941,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -848,7 +959,7 @@ describe Kintsugi, :apply_change_to_project do
           configuration.build_settings["HEADER_SEARCH_PATHS"] = "baz"
         end
-        described_class.apply_change_to_project(ours_project, changes_to_apply)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
         expected_project = create_copy_of_project(base_project.path, "expected")
         expected_project.targets[0].build_configurations.each do |configuration|
@@ -870,7 +981,7 @@ describe Kintsugi, :apply_change_to_project do
           configuration.build_settings["HEADER_SEARCH_PATHS"] = %w[bar foo]
         end
-        described_class.apply_change_to_project(ours_project, changes_to_apply)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
         expected_project = create_copy_of_project(base_project.path, "expected")
         expected_project.targets[0].build_configurations.each do |configuration|
@@ -895,7 +1006,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -914,7 +1025,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -932,7 +1043,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -956,7 +1067,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -976,7 +1087,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -996,7 +1107,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -1017,7 +1128,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         base_project.save
         expected_project = create_copy_of_project(base_project.path, "expected")
@@ -1043,7 +1154,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         base_project.save
         expected_project = create_copy_of_project(base_project.path, "expected")
@@ -1066,7 +1177,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -1084,7 +1195,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, base_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(theirs_project)
       end
@@ -1110,7 +1221,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
-        described_class.apply_change_to_project(base_project, changes_to_apply)
+        described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         expect(base_project).to be_equivalent_to_project(expected_project)
       end
@@ -1132,7 +1243,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
         expect {
-          described_class.apply_change_to_project(base_project, changes_to_apply)
+          described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         }.to raise_error(Kintsugi::MergeError)
       end
@@ -1156,7 +1267,7 @@ describe Kintsugi, :apply_change_to_project do
         changes_to_apply = get_diff(theirs_project, before_theirs_project)
         expect {
-          described_class.apply_change_to_project(base_project, changes_to_apply)
+          described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
         }.to raise_error(Kintsugi::MergeError)
       end
     end
@@ -1173,7 +1284,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1185,7 +1296,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1199,7 +1310,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1217,7 +1328,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1231,7 +1342,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1249,7 +1360,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1263,7 +1374,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1279,7 +1390,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(base_project, changes_to_apply)
+      described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
       expect(base_project).to be_equivalent_to_project(theirs_project)
     end
@@ -1291,7 +1402,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1302,7 +1413,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1315,7 +1426,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1330,7 +1441,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1345,7 +1456,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1360,7 +1471,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1378,7 +1489,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(ours_project, changes_to_apply)
+    described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
     expect(ours_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1395,7 +1506,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(ours_project, changes_to_apply)
+    described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
     expect(ours_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1422,7 +1533,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(ours_project, theirs_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(ours_project, ignore_keys: ["containerPortal"])
   end
@@ -1441,7 +1552,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1456,7 +1567,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1466,7 +1577,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1482,7 +1593,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1500,7 +1611,7 @@ describe Kintsugi, :apply_change_to_project do
     changes_to_apply = get_diff(theirs_project, base_project)
-    described_class.apply_change_to_project(base_project, changes_to_apply)
+    described_class.apply_change_to_project(base_project, changes_to_apply, theirs_project)
     expect(base_project).to be_equivalent_to_project(theirs_project)
   end
@@ -1515,7 +1626,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
       other_project = create_copy_of_project(base_project.path, "theirs")
-      described_class.apply_change_to_project(other_project, changes_to_apply)
+      described_class.apply_change_to_project(other_project, changes_to_apply, theirs_project)
       expect(other_project).to be_equivalent_to_project(base_project)
     end
@@ -1529,7 +1640,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
       other_project = create_copy_of_project(base_project.path, "theirs")
-      described_class.apply_change_to_project(other_project, changes_to_apply)
+      described_class.apply_change_to_project(other_project, changes_to_apply, theirs_project)
       expect(other_project).to be_equivalent_to_project(base_project)
     end
@@ -1543,7 +1654,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
       other_project = create_copy_of_project(base_project.path, "theirs")
-      described_class.apply_change_to_project(other_project, changes_to_apply)
+      described_class.apply_change_to_project(other_project, changes_to_apply, theirs_project)
       expect(other_project).to be_equivalent_to_project(base_project)
     end
@@ -1558,7 +1669,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(ours_project, changes_to_apply)
+      described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
       expect(ours_project.root_object.project_references.count).to equal(1)
     end
@@ -1575,7 +1686,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
       other_project = create_copy_of_project(base_project.path, "theirs")
-      described_class.apply_change_to_project(other_project, changes_to_apply)
+      described_class.apply_change_to_project(other_project, changes_to_apply, theirs_project)
       expect(other_project).to be_equivalent_to_project(base_project)
     end
@@ -1596,7 +1707,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
       other_project = create_copy_of_project(base_project.path, "theirs")
-      described_class.apply_change_to_project(other_project, changes_to_apply)
+      described_class.apply_change_to_project(other_project, changes_to_apply, theirs_project)
       expect(other_project).to be_equivalent_to_project(base_project)
     end
@@ -1619,7 +1730,7 @@ describe Kintsugi, :apply_change_to_project do
       expected_project = create_copy_of_project(ours_project.path, "expected")
-      described_class.apply_change_to_project(ours_project, changes_to_apply)
+      described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
       expect(ours_project).to be_equivalent_to_project(expected_project)
     end
@@ -1644,7 +1755,7 @@ describe Kintsugi, :apply_change_to_project do
       changes_to_apply = get_diff(theirs_project, base_project)
-      described_class.apply_change_to_project(ours_project, changes_to_apply)
+      described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
       expect(ours_project.root_object.project_references[0][:project_ref].uuid)
         .not_to equal(ours_project.root_object.project_references[1][:project_ref].uuid)
@@ -1653,6 +1764,456 @@ describe Kintsugi, :apply_change_to_project do
     end
   end
+  describe "resovling conflicts interactively" do
+    let(:test_prompt) { TTY::Prompt::Test.new }
+    before do
+      Kintsugi::Settings.interactive_resolution = true
+      allow(TTY::Prompt).to receive(:new).and_return(test_prompt)
+      test_prompt.setup
+    end
+    after do
+      Kintsugi::Settings.interactive_resolution = false
+    end
+    describe "adding group to a non existent group" do
+      it "creates the non existent group" do
+        test_prompt.choose_option(0)
+        base_project.main_group.find_subpath("new_group", true)
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project["new_group"].find_subpath("sub_group", true)
+        changes_to_apply = get_diff(theirs_project, base_project)
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.main_group.find_subpath("new_group").remove_from_project
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(theirs_project)
+      end
+      it "ignores adding the group" do
+        test_prompt.choose_option(1)
+        base_project.main_group.find_subpath("new_group", true)
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project["new_group"].find_subpath("sub_group", true)
+        changes_to_apply = get_diff(theirs_project, base_project)
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.main_group.find_subpath("new_group").remove_from_project
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+    describe "adding file to a non existent group" do
+      it "creates the non existent group" do
+        test_prompt.choose_option(0)
+        base_project.main_group.find_subpath("new_group", true)
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project["new_group"].new_reference("foo/bar")
+        changes_to_apply = get_diff(theirs_project, base_project)
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.main_group.find_subpath("new_group").remove_from_project
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(theirs_project)
+      end
+      it "ignores adding the file" do
+        test_prompt.choose_option(1)
+        base_project.main_group.find_subpath("new_group", true)
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project["new_group"].new_reference("foo/bar")
+        changes_to_apply = get_diff(theirs_project, base_project)
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.main_group.find_subpath("new_group").remove_from_project
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+    describe "changing a group that was already removed" do
+      it "creates the group and applies changes to it" do
+        test_prompt.choose_option(0)
+        base_project.main_group.find_subpath("some_group", true)
+        base_project.save
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.main_group.find_subpath("some_group").remove_from_project
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.main_group.find_subpath("some_group").source_tree = "SDKROOT"
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(theirs_project)
+      end
+      it "ignores changes to group" do
+        test_prompt.choose_option(1)
+        base_project.main_group.find_subpath("some_group", true)
+        base_project.save
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.main_group.find_subpath("some_group").remove_from_project
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.main_group.find_subpath("some_group").source_tree = "SDKROOT"
+        changes_to_apply = get_diff(theirs_project, base_project)
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+    describe "changing a component that was already removed" do
+      it "creates the component and applies changes to it" do
+        test_prompt.choose_option(0)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.save
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].product_reference.remove_from_project
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].product_reference.source_tree = "SDKROOT"
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(theirs_project)
+      end
+      it "ignores changes to component" do
+        test_prompt.choose_option(1)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.save
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].product_reference.remove_from_project
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].product_reference.source_tree = "SDKROOT"
+        changes_to_apply = get_diff(theirs_project, base_project)
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+    describe "changing a file reference that has a build file and both were already removed" do
+      it "creates the component and its build file and applies changes to it" do
+        test_prompt.choose_option(0)
+        file_reference_name = "bar"
+        file_reference = base_project.main_group.new_reference(file_reference_name)
+        target = base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        target.source_build_phase.add_file_reference(file_reference)
+        base_project.save
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        build_file = ours_project.targets[0].source_build_phase.files[-1]
+        # Removing the build file first is done because prior to xcodeproj 1.22, the build file was
+        # not removed when its file reference was removed.
+        build_file.remove_from_project
+        ours_project.main_group.find_subpath(file_reference_name).remove_from_project
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.main_group.find_subpath(file_reference_name).source_tree = "SDKROOT"
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(theirs_project)
+      end
+      it "ignores changes to component and to its build file" do
+        test_prompt.choose_option(1)
+        file_reference_name = "bar"
+        file_reference = base_project.main_group.new_reference(file_reference_name)
+        target = base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        target.source_build_phase.add_file_reference(file_reference)
+        base_project.save
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.main_group.find_subpath(file_reference_name).remove_from_project
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.main_group.find_subpath(file_reference_name).source_tree = "SDKROOT"
+        changes_to_apply = get_diff(theirs_project, base_project)
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+    describe "adding entry to a hash that has another value for the same key" do
+      it "overrides values from new hash" do
+        # There will be two conflicts, one for each configuration.
+        test_prompt.choose_option(0, repeating: 2)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = nil
+        end
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {"HEADER_SEARCH_PATHS" => "bar"}
+        end
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {"HEADER_SEARCH_PATHS" => "baz"}
+        end
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(theirs_project)
+      end
+      it "keeps values from old hash" do
+        # There will be two conflicts, one for each configuration.
+        test_prompt.choose_option(1, repeating: 2)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = nil
+        end
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {"HEADER_SEARCH_PATHS" => "bar"}
+        end
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {"HEADER_SEARCH_PATHS" => "baz"}
+        end
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+    describe "trying to remove entry from a hash that has another value for the same key" do
+      it "removes the key" do
+        # There will be two conflicts, one for each configuration.
+        test_prompt.choose_option(0, repeating: 2)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {"HEADER_SEARCH_PATHS" => "bar"}
+        end
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = nil
+        end
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {"HEADER_SEARCH_PATHS" => "baz"}
+        end
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expected_project = create_copy_of_project(base_project.path, "expected")
+        expected_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {}
+        end
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+      it "keeps the key" do
+        # There will be two conflicts, one for each configuration.
+        test_prompt.choose_option(1, repeating: 2)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {"HEADER_SEARCH_PATHS" => "bar"}
+        end
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = nil
+        end
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings = {"HEADER_SEARCH_PATHS" => "baz"}
+        end
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+    describe "trying to change string value that has another existing value" do
+      it "replaces the string with the new value" do
+        # There will be two conflicts, one for each configuration.
+        test_prompt.choose_option(0, repeating: 2)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "old"
+        end
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "new"
+        end
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "existing"
+        end
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(theirs_project)
+      end
+      it "keeps the existing value" do
+        # There will be two conflicts, one for each configuration.
+        test_prompt.choose_option(1, repeating: 2)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "old"
+        end
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "new"
+        end
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].build_configurations.each do |configuration|
+          configuration.build_settings["PRODUCT_NAME"] = "existing"
+        end
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+    describe "trying to remove a component with different attributes" do
+      it "removes the component anyway" do
+        test_prompt.choose_option(0)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.targets[0].new_shell_script_build_phase("bar")
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].shell_script_build_phases[0].remove_from_project
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].shell_script_build_phases[0].shell_script = "foo"
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(theirs_project)
+      end
+      it "keeps the component" do
+        test_prompt.choose_option(1)
+        base_project.new_target("com.apple.product-type.library.static", "foo", :ios)
+        base_project.targets[0].new_shell_script_build_phase("bar")
+        base_project.save
+        theirs_project = create_copy_of_project(base_project.path, "theirs")
+        theirs_project.targets[0].shell_script_build_phases[0].remove_from_project
+        ours_project = create_copy_of_project(base_project.path, "ours")
+        ours_project.targets[0].shell_script_build_phases[0].shell_script = "foo"
+        ours_project.save
+        expected_project = create_copy_of_project(ours_project.path, "expected")
+        changes_to_apply = get_diff(theirs_project, base_project)
+        described_class.apply_change_to_project(ours_project, changes_to_apply, theirs_project)
+        expect(ours_project).to be_equivalent_to_project(expected_project)
+      end
+    end
+  end
   def create_copy_of_project(project_path, new_project_prefix)
     copied_project_path = make_temp_directory(new_project_prefix, ".xcodeproj")
     FileUtils.cp(File.join(project_path, "project.pbxproj"), copied_project_path)
@@ -1743,3 +2304,20 @@ describe Kintsugi, :apply_change_to_project do
     directory_path
   end
 end
+module TTY
+  class Prompt
+    class Test
+      def choose_option(index, repeating: 1)
+        input << "#{"j" * index}\n" * repeating
+        input.rewind
+      end
+      def setup
+        on(:keypress) do |event|
+          trigger(:keydown) if event.value == "j"
+        end
+      end
+    end
+  end
+end