forked from 17thshard/roshar-map
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
7 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |