conflicts_services_pb.rb in gitaly-15.0.0.pre.rc3

- old
+ new

@@ -4,17 +4,21 @@
 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