Skip to content

Commit 054bb46

Browse files
committed
Merge branch 'refs/heads/next' into feat/add-architect
2 parents 7a462f7 + 18b151a commit 054bb46

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

.github/pull.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# 参考:https://wei.github.io/pull/
2+
version: '1'
3+
rules:
4+
- base: main
5+
upstream: 142vip:main
6+
mergeMethod: hardreset
7+
- base: next
8+
upstream: 142vip:next
9+
mergeMethod: hardreset
10+
# 兼容master分支
11+
- base: master
12+
upstream: 142vip:master
13+
mergeMethod: hardreset

0 commit comments

Comments
 (0)