Sha256: b78d3931d22053778571b04cfefebf3cc90bed31fe08d42fc8b8c6fecd3bf761

Contents?: true

Size: 842 Bytes

Versions: 8

Compression:

Stored size: 842 Bytes

Contents

# Generated by the protocol buffer compiler.  DO NOT EDIT!
# Source: conflicts.proto for package 'gitaly'

require 'grpc'
require 'conflicts_pb'

module Gitaly
  module ConflictsService
    class Service

      include GRPC::GenericService

      self.marshal_class_method = :encode
      self.unmarshal_class_method = :decode
      self.service_name = 'gitaly.ConflictsService'

      rpc :ListConflictFiles, Gitaly::ListConflictFilesRequest, stream(Gitaly::ListConflictFilesResponse)
      # ResolveConflicts tries to resolve a conflicting merge with a set of
      # user-provided merge resolutions. If resolving the conflict succeeds, the
      # result will be a new merge commit.
      rpc :ResolveConflicts, stream(Gitaly::ResolveConflictsRequest), Gitaly::ResolveConflictsResponse
    end

    Stub = Service.rpc_stub_class
  end
end

Version data entries

8 entries across 8 versions & 1 rubygems

Version Path
gitaly-14.4.0.pre.rc43 ruby/proto/gitaly/conflicts_services_pb.rb
gitaly-14.3.0.pre.rc2 ruby/proto/gitaly/conflicts_services_pb.rb
gitaly-14.1.0.pre.rc4 ruby/proto/gitaly/conflicts_services_pb.rb
gitaly-14.1.0.pre.rc3 ruby/proto/gitaly/conflicts_services_pb.rb
gitaly-14.1.0.pre.rc2 ruby/proto/gitaly/conflicts_services_pb.rb
gitaly-14.1.0.pre.rc1 ruby/proto/gitaly/conflicts_services_pb.rb
gitaly-14.0.0.pre.rc2 ruby/proto/gitaly/conflicts_services_pb.rb
gitaly-13.12.0.pre.rc1 ruby/proto/gitaly/conflicts_services_pb.rb