This is an automated email from the ASF dual-hosted git repository.
jiacai2050 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-horaedb.git
The following commit(s) were added to refs/heads/main by this push:
new 96ae4205 chore: enable merge on github (#1435)
96ae4205 is described below
commit 96ae42055c6f653ece09ccc831d54f8a38ce890c
Author: WEI Xikai <[email protected]>
AuthorDate: Thu Jan 11 10:36:04 2024 +0800
chore: enable merge on github (#1435)
## Rationale
Sometimes merging a branch with some reviewed PRs into another is
necessary, but it is disabled now.
## Detailed Changes
Enable to merge some branch to another without squashing.
## Test Plan
Nothing to test.
---
.asf.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.asf.yaml b/.asf.yaml
index a3004e81..bf79faca 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -34,7 +34,7 @@ github:
- horaedb
enabled_merge_buttons:
squash: true
- merge: false
+ merge: true
rebase: true
protected_branches:
main:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
