diff options
| author | Hordur Freyr Yngvason <hfyngvason@gitlab.com> | 2023-06-09 04:58:08 +0300 |
|---|---|---|
| committer | Hordur Freyr Yngvason <hfyngvason@gitlab.com> | 2023-06-09 04:58:08 +0300 |
| commit | 00ede28e015c976dfd38ea25407dd2d341ec1d6d (patch) | |
| tree | 39850a05ad2e461ba4d3fa2e1ea7e436e47c2ce7 | |
| parent | 95f665b48030289b350206e964a535fe0b0c8bbd (diff) | |
Make conflict error more informative
See https://gitlab.com/gitlab-org/gitlab/-/issues/282424
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 66988ed8a..a360340c2 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -460,7 +460,8 @@ func (s *Server) UserMergeToRef(ctx context.Context, request *gitalypb.UserMerge if err != nil { var conflictErr git2go.ConflictingFilesError if errors.As(err, &conflictErr) { - return nil, structerr.NewFailedPrecondition("rebase conflict: %w", err) + return nil, structerr.NewFailedPrecondition("Failed to rebase %s on %s while preparing %s due to conflict", + sourceOID, oid, string(request.TargetRef)) } return nil, structerr.NewInternal("rebasing commits: %w", err) |