diff --git a/.github/pull.yml b/.github/pull.yml index fcd019846f..da5f522c1d 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -2,7 +2,7 @@ version: "1" rules: # Array of rules - base: master # Required. Target branch upstream: dolphin-emu:master # Required. Must be in the same fork network. - mergeMethod: hardreset # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. + mergeMethod: rebase # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. mergeUnstable: false # Optional, merge pull request even when the mergeable_state is not clean. Default: false conflictReviewers: # Optional, on merge conflict assign a reviewer - EndangeredNayla