ruby/proto/gitaly/operations_pb.rb in gitaly-13.5.0.pre.rc1 vs ruby/proto/gitaly/operations_pb.rb in gitaly-13.5.0.pre.rc2

@@ -74,9 +74,10 @@
       optional :source_sha, :string, 3
       optional :branch, :bytes, 4
       optional :target_ref, :bytes, 5
       optional :message, :bytes, 6
       optional :first_parent_ref, :bytes, 7
+      optional :allow_conflicts, :bool, 8
     end
     add_message "gitaly.UserMergeToRefResponse" do
       optional :commit_id, :string, 1
       optional :pre_receive_error, :string, 2
     end