mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-09-12 04:22:15 +00:00
Update pull.yml
This commit is contained in:
parent
ba57e43ce2
commit
8807f0fe00
1 changed files with 1 additions and 1 deletions
2
.github/pull.yml
vendored
2
.github/pull.yml
vendored
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue