From 15754ca6adad73906a44cbb04b57a59ce4c2eeb0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 20 Feb 2024 17:23:52 -0600 Subject: [PATCH] Create pull.yaml --- .github/pull.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/pull.yaml diff --git a/.github/pull.yaml b/.github/pull.yaml new file mode 100644 index 0000000000000..9adba73c52ccb --- /dev/null +++ b/.github/pull.yaml @@ -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