From d6f0827e426f78d04c238650ff92e7a0efd1a859 Mon Sep 17 00:00:00 2001
From: Tyler Wanek <tylerw@axosoft.com>
Date: Mon, 18 Apr 2016 09:51:35 -0700
Subject: [PATCH] Correct index.conflictAdd to have optional parameters

when you run into a conflict, sometimes one of the entries just plain old doesn't exist. An example being you create a file in 2 branches and try to merge them. They have no ancestor_entry because they were both created in their respective branches. Therefore, ancestor_entry should be null. The same can apply to our_entry and their_entry
---
 generate/input/descriptor.json | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
index e007440c6..76679337d 100644
--- a/generate/input/descriptor.json
+++ b/generate/input/descriptor.json
@@ -998,7 +998,20 @@
           }
         },
         "git_index_conflict_add": {
-          "isAsync": true,
+          "args": {
+            "index": {
+              "isSelf": true
+            },
+            "ancestor_entry": {
+              "isOptional": true
+            },
+            "our_entry": {
+              "isOptional": true
+            },
+            "their_entry": {
+              "isOptional": true
+            }
+          },
           "return": {
             "isErrorCode": true
           }