From c3037da7a962eb7fcd1f8ddd2569c71c91404413 Mon Sep 17 00:00:00 2001
From: guy-har <60321938+guy-har@users.noreply.github.com>
Date: Thu, 21 Jan 2021 14:42:14 +0200
Subject: [PATCH] Fix empty merge result (#1270)

---
 api/api_controller.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/api_controller.go b/api/api_controller.go
index 2693ade23ab..435b94e154c 100644
--- 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 {