From 81464351b3c63839aeaa4b603b84aafe4d95ae24 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@tabular.io>
Date: Tue, 10 Oct 2023 09:51:14 +0200
Subject: [PATCH 1/2] Disable merge-commit and enforce linear history

This keeps the git history clear
---
 .asf.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index a97dcd3856..f5d45ec478 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -28,6 +28,16 @@ github:
     - apache
     - hacktoberfest
     - pyiceberg
+  enabled_merge_buttons:
+    merge: false
+    squash: true
+    rebase: trueB
+  protected_branches:
+    main:
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+
+      required_linear_history: true
   features:
     wiki: true
     issues: true

From 3e6f4215db07d41d9d1ed69339a1080626c16f21 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Tue, 10 Oct 2023 14:19:41 +0200
Subject: [PATCH 2/2] Update .asf.yaml

Co-authored-by: Renjie Liu <liurenjie2008@gmail.com>
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index f5d45ec478..15e9564420 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -31,7 +31,7 @@ github:
   enabled_merge_buttons:
     merge: false
     squash: true
-    rebase: trueB
+    rebase: true
   protected_branches:
     main:
       required_pull_request_reviews: