From c10a4d02a2f5596e5e9407044c96c8047e277852 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Wed, 25 Oct 2023 08:57:36 -0400
Subject: [PATCH] Infra: Disable merging explicitly in `.asf.yaml` (#8878)

This was done earlier before there was a `.asf.yaml` through an INFRA ticket, but I think it is good to also add it to the `yaml`.
---
 .asf.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index ce24142a51e9..24c309164a50 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -27,6 +27,16 @@ github:
     - iceberg
     - apache
     - hacktoberfest
+  
+  enabled_merge_buttons:
+    merge: false
+    squash: true
+    rebase: true
+
+  protected_branches:
+    main:
+      required_linear_history: true
+  
   features:
     wiki: true
     issues: true