You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by yo...@apache.org on 2021/11/26 09:33:30 UTC

[superset] branch master updated: chore: temporarily enable merge in .asf.yml (#17560)

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

yongjiezhao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 19ffba1  chore: temporarily enable merge in .asf.yml (#17560)
19ffba1 is described below

commit 19ffba1efe98c105379aa6cff0c9147c0112bec2
Author: Yongjie Zhao <yo...@gmail.com>
AuthorDate: Fri Nov 26 09:32:02 2021 +0000

    chore: temporarily enable merge in .asf.yml (#17560)
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 47c1bcc..ebc8e81 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -50,7 +50,7 @@ github:
 
   enabled_merge_buttons:
     squash: true
-    merge: false
+    merge: true
     rebase: false
 
   protected_branches: