This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/master by this push:
new ff0fa69 Enabling only rebase and squash buttons in GitHub PRs (#6661)
ff0fa69 is described below
commit ff0fa6901193bcb7c23d914bfe3cdc6be2fc1801
Author: Nabarun Nag <nabarun...@users.noreply.github.com>
AuthorDate: Tue Jun 29 15:21:38 2021 -0700
Enabling only rebase and squash buttons in GitHub PRs (#6661)
- The merge button is disabled in the PRs
(cherry picked from commit 91cddb0f8e0d20fffd269949ed2cd44b24a1e18a)
---
.asf.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 6ac628c..279389d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -25,8 +25,8 @@ github:
enabled_merge_buttons:
# enable squash button:
squash: true
- # enable merge button:
- merge: true
+ # disable merge button:
+ merge: false
# enable rebase button:
rebase: true
