This is an automated email from the ASF dual-hosted git repository.
aloyszhang 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 ecdf7fee69 [INLONG-10580][ASF] Enable merge and rebase (#10581)
ecdf7fee69 is described below
commit ecdf7fee69ba98b13b4e5d11b42d437f122ae0df
Author: AloysZhang <[email protected]>
AuthorDate: Tue Jul 9 14:09:52 2024 +0800
[INLONG-10580][ASF] Enable merge and rebase (#10581)
---
.asf.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 589863a090..dfd35503f0 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -40,9 +40,9 @@ github:
# enable squash button:
squash: true
# disable merge button:
- merge: false
+ merge: true
# disable rebase button:
- rebase: false
+ rebase: true
# enable the dependabot_alerts
dependabot_alerts: true
# disable the dependabot_updates
