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-06 17:34:54 +0100
commit7fc859233f5ebc243f3e4628353ad1317152da9c (patch)
tree6f31504a415cf48124a3c93349a08480c2d1ffe0
parent990a3bd7240971cc0274b26fa496b88fd6c66f44 (diff)
downloadcouchdb-merge-commits-main.tar.gz
Enable merge commits to mainmerge-commits-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