Fix empty merge result (#1270)

treeverse · Jan 21, 2021 · c3037da · c3037da
1 parent 8cc9966
commit c3037da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/api/api_controller.go b/api/api_controller.go
@@ -764,7 +764,7 @@ func (c *Controller) MergeMergeIntoBranchHandler() refs.MergeIntoBranchHandler {
 
 func newMergeResultFromCatalog(res *catalog.MergeResult) *models.MergeResult {
 	if res == nil {
-		return nil
+		return &models.MergeResult{}
 	}
 	var summary models.MergeResultSummary
 	for k, v := range res.Summary {