[iceberg-rust] branch main updated: fix: Update github configuration to avoid conflicting merge (#31)

[fo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fokko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-rust.git


The following commit(s) were added to refs/heads/main by this push:
     new 2ce9bf5  fix: Update github configuration to avoid conflicting merge (#31)
2ce9bf5 is described below

commit 2ce9bf588e44b3a14d99b7bcfd2ec1e398b330f0
Author: Renjie Liu <li...@gmail.com>
AuthorDate: Tue Aug 15 15:04:22 2023 +0800

    fix: Update github configuration to avoid conflicting merge (#31)
---
 .asf.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index 0fc324a..364b9b2 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -34,8 +34,14 @@ github:
     rebase: false
   protected_branches:
     main:
+      required_status_checks:
+        # strict means "Require branches to be up to date before merging".
+        strict: true
+
       required_pull_request_reviews:
         required_approving_review_count: 1
+
+      required_linear_history: true
   features:
     wiki: false
     issues: true