[incubator-nuttx-website] 02/02: .asf.yaml: Disable squash and merge option

[bt...@apache.org]

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

btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git

commit 1b0ac8d479c3ffb12ce1817e79978b2f829e55e4
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat May 2 12:05:35 2020 +0800

    .asf.yaml: Disable squash and merge option
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 .asf.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 6ec4769..b3f60c6 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -2,9 +2,9 @@ github:
   description: "Apache NuttX Website"
   homepage: https://nuttx.apache.org/
   features:
-    # Enable issues managment
+    # Enable issues management
     issues: true
-    # Enable project for project managment boards
+    # Enable project for project management boards
     projects: true
   labels:
     - nuttx
@@ -14,9 +14,9 @@ github:
     - mcu
     - microcontroller
   enabled_merge_buttons:
-    # enable squash button:
-    squash:  true
-    # enable merge button:
-    merge:   true
+    # disable squash button:
+    squash:  false
+    # disable merge button:
+    merge:   false
     # enable rebase button:
     rebase:  true