gitaly-git2go: Add generic error field for resolve conflicts

Adding this field was missed in the original change 2af0319c94

1 files changed, 8 insertions, 0 deletions

diff --git a/internal/git2go/resolve_conflicts.go b/internal/git2go/resolve_conflicts.go
index 5be31e96a..ae2545531 100644
--- a/internal/git2go/resolve_conflicts.go
+++ b/internal/git2go/resolve_conflicts.go
@@ -20,6 +20,10 @@ type ResolveCommand struct {
 // ResolveResult returns information about the successful merge and resolution
 type ResolveResult struct {
 	MergeResult
+
+	// Err is set if an error occurred. Err must exist on all gob serialized
+	// results so that any error can be returned.
+	Err error
 }
 
 // Resolve will attempt merging and resolving conflicts for the provided request
@@ -43,5 +47,9 @@ func (b *Executor) Resolve(ctx context.Context, repo repository.GitRepo, r Resol
 		return ResolveResult{}, fmt.Errorf("resolve: %w", err)
 	}
 
+	if response.Err != nil {
+		return ResolveResult{}, response.Err
+	}
+
 	return response, nil
 }