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

Posted to commits@couchdb.apache.org by rn...@apache.org on 2020/10/07 07:46:15 UTC

[couchdb] branch main updated: Enable merge commits to main

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

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


The following commit(s) were added to refs/heads/main by this push:
     new f2c30fe  Enable merge commits to main
f2c30fe is described below

commit f2c30fe388dc96d00265ed2f7f99b33df8eabfc0
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