This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new 7766ddb42 Revert "build: temporarily enable merge to allow merging
Scala 3 branch (#140)"
7766ddb42 is described below
commit 7766ddb42576a09d1ba68ecc9d831ae524cbb452
Author: Matthew de Detrich <[email protected]>
AuthorDate: Fri May 26 14:20:19 2023 +0200
Revert "build: temporarily enable merge to allow merging Scala 3 branch
(#140)"
This reverts commit 9434ac6cdbc9814696a4b3aa1b359b382918219e.
---
.asf.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 3f71473d4..599aa2252 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -13,7 +13,7 @@ github:
- streaming
- reactive
- websocket
-
+
features:
# Enable wiki for documentation
wiki: false
@@ -21,10 +21,10 @@ github:
issues: true
# Enable projects for project management boards
projects: true
-
+
enabled_merge_buttons:
squash: true
- merge: true
+ merge: false
rebase: true
protected_branches:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
