diff --git a/.github/pull.yml b/.github/pull.yml index 76879bce..ce40fd76 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -4,13 +4,14 @@ rules: # Array of rules upstream: nonebot:master # Required. Must be in the same fork network. 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 - - base: dev - upstream: nonebot:dev # Required. Can be a branch in the same forked repo. assignees: # Optional - yanyongyu reviewers: # Optional - yanyongyu conflictReviewers: # Optional, on merge conflict assign a reviewer - yanyongyu + - base: dev + upstream: nonebot:dev # Required. Can be a branch in the same forked repo. + mergeMethod: hardreset label: ":arrow_heading_down: pull" # Optional conflictLabel: "merge-conflict" # Optional, on merge conflict assign a custom label, Default: merge-conflict