Add case for a three-way conflict

CocoaPods · Nov 25, 2014 · b599277 · b599277
1 parent 73707e1
commit b599277
Show file tree

Hide file tree

Showing 2 changed files with 411 additions and 0 deletions.
diff --git a/case/three_way_conflict.json b/case/three_way_conflict.json
@@ -0,0 +1,46 @@
+{
+  "name": "resolves a three-way conflict index",
+  "index": "three_way_conflict",
+  "requested": {
+    "AFAmazonS3Client": "",
+    "CargoBay": "",
+    "AFOAuth2Client": ""
+  },
+  "base": [],
+  "resolved": [
+    {
+      "name": "AFAmazonS3Client",
+      "version": "1.0.1",
+      "dependencies": [
+        {
+          "name": "AFNetworking",
+          "version": "1.3.4",
+          "dependencies": []
+        }
+      ]
+    },
+    {
+      "name": "CargoBay",
+      "version": "1.0.0",
+      "dependencies": [
+        {
+          "name": "AFNetworking",
+          "version": "1.3.4",
+          "dependencies": []
+        }
+      ]
+    },
+    {
+      "name": "AFOAuth2Client",
+      "version": "0.1.2",
+      "dependencies": [
+        {
+          "name": "AFNetworking",
+          "version": "1.3.4",
+          "dependencies": []
+        }
+      ]
+    }
+  ],
+  "conflicts": []
+}