operations_pb.rb in gitaly-15.2.0.pre.rc1

- old
+ new

@@ -75,17 +75,17 @@
       optional :apply, :bool, 6
     end
     add_message "gitaly.UserMergeBranchResponse" do
       optional :commit_id, :string, 1
       optional :branch_update, :message, 3, "gitaly.OperationBranchUpdate"
-      optional :pre_receive_error, :string, 4
     end
     add_message "gitaly.UserMergeBranchError" do
       oneof :error do
         optional :access_check, :message, 1, "gitaly.AccessCheckError"
         optional :reference_update, :message, 2, "gitaly.ReferenceUpdateError"
         optional :custom_hook, :message, 3, "gitaly.CustomHookError"
+        optional :merge_conflict, :message, 4, "gitaly.MergeConflictError"
       end
     end
     add_message "gitaly.UserMergeToRefRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :user, :message, 2, "gitaly.User"
@@ -97,11 +97,10 @@
       optional :allow_conflicts, :bool, 8
       optional :timestamp, :message, 9, "google.protobuf.Timestamp"
     end
     add_message "gitaly.UserMergeToRefResponse" do
       optional :commit_id, :string, 1
-      optional :pre_receive_error, :string, 2
     end
     add_message "gitaly.OperationBranchUpdate" do
       optional :commit_id, :string, 1
       optional :repo_created, :bool, 2
       optional :branch_created, :bool, 3
@@ -250,10 +249,9 @@
       optional :commit_message, :bytes, 8
       optional :timestamp, :message, 9, "google.protobuf.Timestamp"
     end
     add_message "gitaly.UserSquashResponse" do
       optional :squash_sha, :string, 1
-      optional :git_error, :string, 3
     end
     add_message "gitaly.UserRebaseConfirmableError" do
       oneof :error do
         optional :rebase_conflict, :message, 1, "gitaly.MergeConflictError"
         optional :access_check, :message, 2, "gitaly.AccessCheckError"