mirror of
https://github.com/Oldcustard/ozfort-server-configs
synced 2025-06-25 15:01:41 +10:00
change to merge method
This commit is contained in:
parent
b705d4f567
commit
ded02f015f
2
.github/pull.yml
vendored
2
.github/pull.yml
vendored
@ -2,4 +2,4 @@ version: "1"
|
||||
rules:
|
||||
- base: master
|
||||
upstream: ozfortress:master # change `wei` to the owner of upstream repo
|
||||
mergeMethod: rebase
|
||||
mergeMethod: merge
|
||||
|
Loading…
Reference in New Issue
Block a user