Sha256: ef51e4552360b144465556dedd852a936d859cb0425776dfe1aca4fd32921a3b
Contents?: true
Size: 1.06 KB
Versions: 228
Compression:
Stored size: 1.06 KB
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
# ConflictsService is a service which provides RPCs to interact with conflicts
# resulting from a merge.
class Service
include ::GRPC::GenericService
self.marshal_class_method = :encode
self.unmarshal_class_method = :decode
self.service_name = 'gitaly.ConflictsService'
# ListConflictFiles returns all conflicting files which result from a merge
# of two specified commit objects.
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
228 entries across 228 versions & 3 rubygems