From 79582e428e01f45653f384e980643e14193db2b8 Mon Sep 17 00:00:00 2001
From: Zhouxiang Zhan <zhouxiang.zzx@alibaba-inc.com>
Date: Mon, 26 Feb 2024 18:55:43 +0800
Subject: [PATCH] Update .asf.yaml to enable merge java_release_5.0.6 (#686)

To keep the origin commit id.
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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