From 108087466601c46d6ee821422ee7652998613375 Mon Sep 17 00:00:00 2001 From: Zhouxiang Zhan Date: Mon, 26 Feb 2024 19:00:38 +0800 Subject: [PATCH] Revert "Update .asf.yaml to enable merge java_release_5.0.6 (#686)" (#687) This reverts commit 79582e428e01f45653f384e980643e14193db2b8. --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 14012838a..4f5661ebb 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -33,7 +33,7 @@ github: # Enable squash button squash: true # Disable merge button - merge: true + merge: false # Disable rebase button rebase: false protected_branches: