try using Pull app

zmap · Jun 11, 2024 · 96b20ba · 96b20ba
1 parent 11ee250
commit 96b20ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 46 deletions.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -0,0 +1,9 @@
+# Config for https://github.com/wei/pull Pull app
+version: "1"
+rules:                      # Array of rules
+  - base: master            # Required. Target branch
+    upstream: miekg/dns:master    # Required. Must be in the same fork network.
+    mergeMethod: none  # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
+    mergeUnstable: false    # Optional, merge pull request even when the mergeable_state is not clean. Default: false
+label: ":arrow_heading_down: pull"  # Optional
+conflictLabel: "merge-conflict"     # Optional, on merge conflict assign a custom label, Default: merge-conflict
diff --git a/.github/workflows/upstream-tag-check.yml b/.github/workflows/upstream-tag-check.yml