ruby/proto/gitaly/errors_pb.rb in gitaly-15.1.0.pre.rc1 vs ruby/proto/gitaly/errors_pb.rb in gitaly-15.2.0.pre.rc1

@@ -21,9 +21,10 @@
     end
     add_message "gitaly.ChangesAlreadyAppliedError" do
     end
     add_message "gitaly.MergeConflictError" do
       repeated :conflicting_files, :bytes, 1
+      repeated :conflicting_commit_ids, :string, 2
     end
     add_message "gitaly.ReferencesLockedError" do
     end
     add_message "gitaly.ReferenceUpdateError" do
       optional :reference_name, :bytes, 1