summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2020-10-06 17:34:54 +0100
committerRobert Newson <rnewson@apache.org>2020-10-07 08:44:14 +0100
commitf2c30fe388dc96d00265ed2f7f99b33df8eabfc0 (patch)
treeaa46f520d7f34c19086d771d92ce144e2a5cef62
parent2b3badb04bb9434e6c85166e36c1d337bf405da2 (diff)
downloadcouchdb-f2c30fe388dc96d00265ed2f7f99b33df8eabfc0.tar.gz
Enable merge commits to main
-rw-r--r--.asf.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.asf.yaml b/.asf.yaml
index a3b51fffa..66715b649 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