From b7f1295277bc6b223e37c3acc7ceb46d58ceb1a1 Mon Sep 17 00:00:00 2001
From: Bryan Call <bcall@apache.org>
Date: Wed, 1 Feb 2023 10:35:41 -0800
Subject: [PATCH] Enable merging for 10-Dev merge

---
 .asf.yaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 9018f895a9c..478551c4189 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -11,6 +11,11 @@ github:
     - cdn
     - cache
     - apache
+    - http/2
+    - http/3
+    - quic
+    - forwardproxy
+    - reverseproxy
     - hacktoberfest
   features:
     # Enable wiki for documentation
@@ -24,14 +29,11 @@ github:
     squash: true
     # Disable rebase button:
     rebase: false
-    # Disable merge button:
-    merge: false
+    # Enable merge button:
+    merge: true
   collaborators:
     - mtorluemke
     - c-taylor
-    - moonchen
-    - cmcfarlen
-    - serrislew
     - etapia
   protected_branches:
     master: