forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
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
1 parent
aa4e694
commit 15754ca
Showing
1 changed file
with
12 additions
and
0 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 |
---|---|---|
@@ -0,0 +1,12 @@ | ||
version: "1" | ||
rules: # Array of rules | ||
- base: master # Required. Target branch | ||
upstream: wei:master # Required. Must be in the same fork network. | ||
mergeMethod: hardreset # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. | ||
mergeUnstable: true # Optional, merge pull request even when the mergeable_state is not clean. Default: false | ||
- base: nixos-unstable | ||
upstream: nixos-unstable # Required. Can be a branch in the same forked repo. | ||
mergeMethod: hardreset # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. | ||
mergeUnstable: true # 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 |