This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 32508829b9 Disable "Allow merge commits" and "Allow rebase merging"
(#7367)
32508829b9 is described below
commit 32508829b97098fe16270513e4022b17ecd7a79c
Author: Zach Hoffman <[email protected]>
AuthorDate: Mon Feb 27 14:49:30 2023 -0700
Disable "Allow merge commits" and "Allow rebase merging" (#7367)
---
.asf.yaml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.asf.yaml b/.asf.yaml
index 2fdc304319..fb84cb09b2 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -24,6 +24,13 @@
# - The #traffic-control channel of the ASF Slack (invite link:
https://s.apache.org/tc-slack-request)
# - The ATC Development mailing list:
https://trafficcontrol.apache.org/mailing_lists
github:
+ enabled_merge_buttons:
+ # enable merge button:
+ merge: false
+ # enable squash button:
+ squash: true
+ # disable rebase button:
+ rebase: false
collaborators:
- joobisb
- srijeet0406
