diff options
Diffstat (limited to 'internal/gitaly/service/operations/merge.go')
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 3cbd0a465..f4c729bb8 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -350,7 +350,9 @@ func (s *Server) UserMergeToRef(ctx context.Context, in *gitalypb.UserMergeToRef return nil, helper.ErrInvalidArgument(err) } - if featureflag.IsEnabled(ctx, featureflag.GoUserMergeToRef) && !in.AllowConflicts { + // Ruby has grown a new feature since being ported to Go, and we don't + // handle that yet. + if !in.AllowConflicts { return s.userMergeToRef(ctx, in) } |