Configure probot-auto-merge instead of automerge (#2984)

electricitymaps · Feb 9, 2021 · 85c4b22 · 85c4b22
1 parent f615bb8
commit 85c4b22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/.github/auto-merge.yml b/.github/auto-merge.yml
@@ -0,0 +1,11 @@
+# Configuration for probot-auto-merge - https://github.com/bobvanderlinden/probot-auto-merge
+
+minApprovals:
+  NONE: 0
+updateBranch: true
+deleteBranchAfterMerge: true
+mergeMethod: squash
+reportStatus: true
+requiredLabels:
+- automerge
+
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml