Merge pull request zhonghuaifang#7 from buiawpkgew1/patch-2

修复pull
linjunyou04 · Jan 29, 2023 · 12da9c3 · 12da9c3
2 parents f40b22c + 24869e9
commit 12da9c3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -1,6 +1,5 @@
 version: "1"
 rules:                      # Array of rules
-  - base: master            # Required. Target branch
-    upstream: BlueskyClouds:master    # Required. Must be in the same fork network.
-    mergeMethod: hardreset  # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
-    mergeUnstable: true    # Optional, merge pull request even when the mergeable_state is not clean. Default: false
+  - base: main            # Required. Target branch
+    upstream: zhonghuaifang:main    # Required. Must be in the same fork network.
+    mergeMethod: merge  # Optional, one of [none, merge, squash, rebase, hardreset], Default: none