From 656e476dcba0a0c5737d0aaa7f522987e8f58c53 Mon Sep 17 00:00:00 2001
From: chufan <mmdapl@163.com>
Date: Thu, 22 May 2025 10:11:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0`pull`=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E7=BA=BF=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=B8=8B=E6=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/pull.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/pull.yml

diff --git a/.github/pull.yml b/.github/pull.yml
new file mode 100644
index 000000000..64e2e2b41
--- /dev/null
+++ b/.github/pull.yml
@@ -0,0 +1,13 @@
+# 参考：https://wei.github.io/pull/
+version: '1'
+rules:
+  - base: main
+    upstream: 142vip:main
+    mergeMethod: hardreset
+  - base: next
+    upstream: 142vip:next
+    mergeMethod: hardreset
+  # 兼容master分支
+  - base: master
+    upstream: 142vip:master
+    mergeMethod: hardreset