From 9d434dc57bc47bf3be7205eae5cdc86008aa0d3c Mon Sep 17 00:00:00 2001
From: Vinai Rachakonda <vinai@dolthub.com>
Date: Tue, 3 Aug 2021 17:05:46 -0700
Subject: [PATCH] Edit dolt merge ret type again  (#1967)

---
 .../doltcore/sqle/dfunctions/dolt_merge.go     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/go/libraries/doltcore/sqle/dfunctions/dolt_merge.go b/go/libraries/doltcore/sqle/dfunctions/dolt_merge.go
index f6d54cfc39..b116d47fd2 100644
--- a/go/libraries/doltcore/sqle/dfunctions/dolt_merge.go
+++ b/go/libraries/doltcore/sqle/dfunctions/dolt_merge.go
@@ -60,7 +60,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	args, err := getDoltArgs(ctx, row, d.Children())
 
 	if err != nil {
-		return nil, err
+		return noConflicts, err
 	}
 
 	apr, err := ap.Parse(args)
@@ -74,7 +74,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 
 	ws, err := sess.WorkingSet(ctx, dbName)
 	if err != nil {
-		return nil, err
+		return noConflicts, err
 	}
 	roots, ok := sess.GetRoots(ctx, dbName)
 
@@ -99,7 +99,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 			return noConflicts, err
 		}
 
-		return "Merge aborted", nil
+		return noConflicts, nil
 	}
 
 	ddb, ok := sess.GetDoltDB(ctx, dbName)
@@ -129,7 +129,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	}
 
 	branchName := apr.Arg(0)
-	mergeCommit, cmh, err := getBranchCommit(ctx, branchName, ddb)
+	mergeCommit, _, err := getBranchCommit(ctx, branchName, ddb)
 	if err != nil {
 		return noConflicts, err
 	}
@@ -176,7 +176,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 			}
 
 			if err != nil {
-				return nil, err
+				return noConflicts, err
 			}
 			return noConflicts, err
 		}
@@ -203,13 +203,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 		return noConflicts, err
 	}
 
-	hch, err := headCommit.HashOf()
-	if err != nil {
-		return noConflicts, err
-	}
-
-	returnMsg := fmt.Sprintf("Updating %s..%s", hch.String(), cmh.String())
-	return returnMsg, nil
+	return noConflicts, nil
 }
 
 func abortMerge(ctx *sql.Context, workingSet *doltdb.WorkingSet, roots doltdb.Roots) (*doltdb.WorkingSet, error) {