This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new ba37cf7e5f [INLONG-10582][ASF] Disable merge and rebase merge (#10583)
ba37cf7e5f is described below
commit ba37cf7e5f866516647d775824336cd54330971e
Author: AloysZhang <[email protected]>
AuthorDate: Tue Jul 9 16:57:51 2024 +0800
[INLONG-10582][ASF] Disable merge and rebase merge (#10583)
Co-authored-by: Aloys Zhang <[email protected]>
---
.asf.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index dfd35503f0..589863a090 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -40,9 +40,9 @@ github:
# enable squash button:
squash: true
# disable merge button:
- merge: true
+ merge: false
# disable rebase button:
- rebase: true
+ rebase: false
# enable the dependabot_alerts
dependabot_alerts: true
# disable the dependabot_updates
