From 1543dd543ecfe5a4a0b7fe292df73714fa154834 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 28 Jan 2021 22:19:58 -0800 Subject: [PATCH] Keep fork up-to-date --- .github/pull.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/pull.yml diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000000..4c0b7a402377 --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,18 @@ +--- +version: "1" +rules: + - base: master + upstream: qmk:master + mergeMethod: hardreset + mergeUnstable: false + - base: kruton + upstream: qmk:master + mergeMethod: rebase + assignees: + - kruton + reviewers: + - kruton + conflictReviewers: + - kruton +label: ":arrow_heading_down: pull" +conflictLabel: "merge-conflict"