[airflow] branch main updated: Enable "Rebase and merge" button on PRs. (#16882)

[as...@apache.org]

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

ash pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 12d48a8  Enable "Rebase and merge" button on PRs. (#16882)
12d48a8 is described below

commit 12d48a89b5472f522af9199de62b2193b3cc2146
Author: Ash Berlin-Taylor <as...@firemirror.com>
AuthorDate: Thu Jul 8 10:37:12 2021 +0100

    Enable "Rebase and merge" button on PRs. (#16882)
    
    The default will still be Squash and Merge, but there are some times
    (mostly when working on release branches, but a few other cases have
    cropped up) where we want to accept a PR but keep the commits.
    
    Rather than making committers need to use the CLI and having to know
    that you can approve a PR on GitHub (but don't merge it there) and then
    manually push, lets just let people do it in GitHub directly.
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index a6876d9..3c280b8 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -38,7 +38,7 @@ github:
   enabled_merge_buttons:
     squash: true
     merge: false
-    rebase: false
+    rebase: true
 
   protected_branches:
     main: