Skip to content

Commit

Permalink
update bot config
Browse files Browse the repository at this point in the history
  • Loading branch information
lianzhao committed Nov 6, 2020
1 parent fe0d3c9 commit 6b43ee2
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions .github/pull.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
version: "1"
rules: # Array of rules
- base: master # Required. Target branch
upstream: Palanaeum:master # Required. Must be in the same fork network.
mergeMethod: merge # 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: chinese-translation
upstream: master # Required. Can be a branch in the same forked repo.
# assignees: # Optional
# - wei
# reviewers: # Optional
# - wei
# conflictReviewers: # Optional, on merge conflict assign a reviewer
# - wei
label: ":arrow_heading_down: pull" # Optional
conflictLabel: "merge-conflict" # Optional, on merge conflict assign a custom label, Default: merge-conflict
rules: # Array of rules
- base: chinese-translation # Required. Target branch
upstream: Palanaeum:master # Required. Must be in the same fork network.
mergeMethod: merge # 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
label: ":arrow_heading_down: pull" # Optional
conflictLabel: "merge-conflict" # Optional, on merge conflict assign a custom label, Default: merge-conflict

0 comments on commit 6b43ee2

Please sign in to comment.