Update pull.yml

This commit is contained in:
Nayla 2023-04-23 08:37:59 -04:00 committed by GitHub
commit 8807f0fe00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

2
.github/pull.yml vendored
View file

@ -2,7 +2,7 @@ version: "1"
rules: # Array of rules rules: # Array of rules
- base: master # Required. Target branch - base: master # Required. Target branch
upstream: dolphin-emu:master # Required. Must be in the same fork network. 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 mergeUnstable: false # Optional, merge pull request even when the mergeable_state is not clean. Default: false
conflictReviewers: # Optional, on merge conflict assign a reviewer conflictReviewers: # Optional, on merge conflict assign a reviewer
- EndangeredNayla - EndangeredNayla