[couchdb] branch merge-commits-main created (now 7fc8592)

[rn...@apache.org]

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

rnewson pushed a change to branch merge-commits-main
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


      at 7fc8592  Enable merge commits to main

This branch includes the following new commits:

     new 7fc8592  Enable merge commits to main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] 01/01: Enable merge commits to main

[rn...@apache.org]

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

rnewson pushed a commit to branch merge-commits-main
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 7fc859233f5ebc243f3e4628353ad1317152da9c
Author: Robert Newson <rn...@apache.org>
AuthorDate: Tue Oct 6 17:34:54 2020 +0100

    Enable merge commits to main
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index a3b51ff..66715b6 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -20,7 +20,7 @@ github:
   enabled_merge_buttons:
     squash: true
     rebase: true
-    merge: false
+    merge: true
 
 notifications:
   commits: commits@couchdb.apache.org