diff --git a/.github/pull.yml b/.github/pull.yml index d99c6c7..fbdeb18 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -2,4 +2,4 @@ version: "1" rules: - base: master upstream: ozfortress:master # change `wei` to the owner of upstream repo - mergeMethod: rebase + mergeMethod: merge