From 282b18da5a766c33716b729940a9d6d7f86f4435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=BE=E5=87=B4?=
 <71136405+buiawpkgew1@users.noreply.github.com>
Date: Sat, 21 Jan 2023 15:53:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/pull.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/pull.yml b/.github/pull.yml
index 05cd431..470ade8 100644
--- a/.github/pull.yml
+++ b/.github/pull.yml
@@ -1,6 +1,6 @@
 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.
+    upstream: zhonghuaifang:master    # Required. Must be in the same fork network.
+    mergeMethod: merge  # 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

From 24869e9fe846961549c44cabf2cda6a61766672f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=BE=E5=87=B4?=
 <71136405+buiawpkgew1@users.noreply.github.com>
Date: Sat, 21 Jan 2023 15:55:29 +0800
Subject: [PATCH 2/2] Update pull.yml

---
 .github/pull.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/pull.yml b/.github/pull.yml
index 470ade8..762bd68 100644
--- a/.github/pull.yml
+++ b/.github/pull.yml
@@ -1,6 +1,5 @@
 version: "1"
 rules:                      # Array of rules
-  - base: master            # Required. Target branch
-    upstream: zhonghuaifang:master    # Required. Must be in the same fork network.
-    mergeMethod: merge  # 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