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

Posted to commits@arrow.apache.org by al...@apache.org on 2025/03/20 18:56:20 UTC

(arrow-rs-object-store) branch main updated: Disable merge

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

alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-rs-object-store.git


The following commit(s) were added to refs/heads/main by this push:
     new 99cd4c7  Disable merge
99cd4c7 is described below

commit 99cd4c72894c4dc8194a807a89986e2f5f208b2d
Author: Andrew Lamb <an...@nerdnetworks.org>
AuthorDate: Thu Mar 20 14:56:12 2025 -0400

    Disable merge
---
 .asf.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 79df86d..cda93fe 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -31,9 +31,7 @@ github:
     - object-store
   enabled_merge_buttons:
     squash: true
-    #merge: false
-    # enable merge temporarily to preserve imported history
-    merge: true
+    merge: false
     rebase: false
   features:
     issues: true