This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
The following commit(s) were added to refs/heads/master by this push:
new 10808746 Revert "Update .asf.yaml to enable merge java_release_5.0.6
(#686)" (#687)
10808746 is described below
commit 108087466601c46d6ee821422ee7652998613375
Author: Zhouxiang Zhan <[email protected]>
AuthorDate: Mon Feb 26 19:00:38 2024 +0800
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 14012838..4f5661eb 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:
