This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 67eef395e2 Fix misleading comment in .asf.yaml for merge button
(#12984)
67eef395e2 is described below
commit 67eef395e22e11e71376a69431f767ad7dca59c3
Author: Bryan Call <[email protected]>
AuthorDate: Wed Mar 18 11:13:28 2026 -0700
Fix misleading comment in .asf.yaml for merge button (#12984)
The comment said "Disable merge button" but the value was set to
true. Update the comment to correctly reflect the setting.
---
.asf.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 1761e927cd..b79e9fc462 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -29,8 +29,8 @@ github:
squash: true
# Disable rebase button:
rebase: false
- # Disable merge button:
- merge: false
+ # Enable merge button:
+ merge: true
collaborators:
- mtorluemke
- c-taylor
