blob: 344f5afa2464afc2e802189a5bdd34baf83dfd5a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
# 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'
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
|
