You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@trafficserver.apache.org by bc...@apache.org on 2023/02/01 22:05:44 UTC

[trafficserver] branch master updated: Disable merging on GitHub (#9354)

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 fee02d6dae Disable merging on GitHub (#9354)
fee02d6dae is described below

commit fee02d6dae0a74b2844225f17938e138e0c0695d
Author: Bryan Call <bc...@apache.org>
AuthorDate: Wed Feb 1 14:05:34 2023 -0800

    Disable merging on GitHub (#9354)
---
 .asf.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 478551c418..31ee0d40aa 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -29,8 +29,8 @@ github:
     squash: true
     # Disable rebase button:
     rebase: false
-    # Enable merge button:
-    merge: true
+    # Disable merge button:
+    merge: false
   collaborators:
     - mtorluemke
     - c-taylor