commit 108087466601c46d6ee821422ee7652998613375
author Zhouxiang Zhan <zhouxiang.zzx@alibaba-inc.com> Mon Feb 26 19:00:38 2024 +0800
committer GitHub <noreply@github.com> Mon Feb 26 19:00:38 2024 +0800
tree f4afe28f5f6d37364e430b2219a92c79aaea67fd
parent 5bd9b4fc54c9f0c43d0f6929d431d936070a7db7

Revert "Update .asf.yaml to enable merge java_release_5.0.6 (#686)" (#687)

This reverts commit 79582e428e01f45653f384e980643e14193db2b8.

.asf.yaml

diff --git a/.asf.yaml b/.asf.yaml
index 1401283..4f5661e 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -33,7 +33,7 @@
     # Enable squash button
     squash: true
     # Disable merge button
-    merge: true
+    merge: false
     # Disable rebase button
     rebase: false
   protected_branches: